Skip to content

Commit ed9a64d

Browse files
author
begoldsm
committed
Missed two updated tests.
1 parent c382b75 commit ed9a64d

File tree

2 files changed

+32
-32
lines changed

2 files changed

+32
-32
lines changed

‎src/ResourceManager/DataLakeAnalytics/Commands.DataLakeAnalytics.Test/ScenarioTests/AdlaAliasTests.ps1

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ function Test-DataLakeAnalyticsAccount
3838
for ($i = 0; $i -le 60; $i++)
3939
{
4040
[array]$accountGet = Get-AdlAnalyticsAccount -ResourceGroupName $resourceGroupName -Name $accountName
41-
if ($accountGet[0].Properties.ProvisioningState -like "Succeeded")
41+
if ($accountGet[0].ProvisioningState -like "Succeeded")
4242
{
4343
Assert-AreEqual $accountName $accountGet[0].Name
4444
Assert-AreEqual $location $accountGet[0].Location
@@ -47,7 +47,7 @@ function Test-DataLakeAnalyticsAccount
4747
break
4848
}
4949

50-
Write-Host "account not yet provisioned. current state: $($accountGet[0].Properties.ProvisioningState)"
50+
Write-Host "account not yet provisioned. current state: $($accountGet[0].ProvisioningState)"
5151
[Microsoft.Rest.ClientRuntime.Azure.TestFramework.TestUtilities]::Wait(30000)
5252
Assert-False {$i -eq 60} "dataLakeAnalytics account is not in succeeded state even after 30 min."
5353
}
@@ -111,7 +111,7 @@ function Test-DataLakeAnalyticsAccount
111111

112112
# get the account and ensure that it contains two data lake stores
113113
$testStoreAdd = Get-AdlAnalyticsAccount -Name $accountName
114-
Assert-AreEqual 2 $testStoreAdd.Properties.DataLakeStoreAccounts.Count
114+
Assert-AreEqual 2 $testStoreAdd.DataLakeStoreAccounts.Count
115115

116116
# get the specific data source added
117117
$adlsAccountInfo = Get-AdlAnalyticsDataSource -Account $accountName -DataLakeStore $secondDataLakeAccountName
@@ -126,14 +126,14 @@ function Test-DataLakeAnalyticsAccount
126126

127127
# get the account and ensure that it contains one data lake store
128128
$testStoreAdd = Get-AdlAnalyticsAccount -Name $accountName
129-
Assert-AreEqual 1 $testStoreAdd.Properties.DataLakeStoreAccounts.Count
129+
Assert-AreEqual 1 $testStoreAdd.DataLakeStoreAccounts.Count
130130

131131
# add a blob account to the analytics account
132132
Add-AdlAnalyticsDataSource -Account $accountName -Blob $blobAccountName -AccessKey $blobAccountKey
133133

134134
# get the account and ensure that it contains one blob account
135135
$testStoreAdd = Get-AdlAnalyticsAccount -Name $accountName
136-
Assert-AreEqual 1 $testStoreAdd.Properties.StorageAccounts.Count
136+
Assert-AreEqual 1 $testStoreAdd.StorageAccounts.Count
137137

138138
# get the specific data source added
139139
$blobAccountInfo = Get-AdlAnalyticsDataSource -Account $accountName -Blob $blobAccountName
@@ -148,7 +148,7 @@ function Test-DataLakeAnalyticsAccount
148148

149149
# get the account and ensure that it contains no azure storage accounts
150150
$testStoreAdd = Get-AdlAnalyticsAccount -Name $accountName
151-
Assert-True {$testStoreAdd.Properties.StorageAccounts -eq $null -or $testStoreAdd.Properties.StorageAccounts.Count -eq 0} "Remove blob storage reported success but failed to remove the account."
151+
Assert-True {$testStoreAdd.StorageAccounts -eq $null -or $testStoreAdd.StorageAccounts.Count -eq 0} "Remove blob storage reported success but failed to remove the account."
152152

153153
# Delete dataLakeAnalytics account
154154
Assert-True {Remove-AdlAnalyticsAccount -ResourceGroupName $resourceGroupName -Name $accountName -Force -PassThru} "Remove Account failed."
@@ -240,7 +240,7 @@ function Test-DataLakeAnalyticsJob
240240
New-AzureRmResourceGroup -Name $resourceGroupName -Location $location
241241
New-AdlStore -ResourceGroupName $resourceGroupName -Name $dataLakeAccountName -Location $location
242242
$accountCreated = New-AdlAnalyticsAccount -ResourceGroupName $resourceGroupName -Name $accountName -Location $location -DefaultDataLakeStore $dataLakeAccountName
243-
$nowTime = $accountCreated.Properties.CreationTime
243+
$nowTime = $accountCreated.CreationTime
244244
Assert-AreEqual $accountName $accountCreated.Name
245245
Assert-AreEqual $location $accountCreated.Location
246246
Assert-AreEqual "Microsoft.DataLakeAnalytics/accounts" $accountCreated.Type
@@ -250,7 +250,7 @@ function Test-DataLakeAnalyticsJob
250250
for ($i = 0; $i -le 60; $i++)
251251
{
252252
[array]$accountGet = Get-AdlAnalyticsAccount -ResourceGroupName $resourceGroupName -Name $accountName
253-
if ($accountGet[0].Properties.ProvisioningState -like "Succeeded")
253+
if ($accountGet[0].ProvisioningState -like "Succeeded")
254254
{
255255
Assert-AreEqual $accountName $accountGet[0].Name
256256
Assert-AreEqual $location $accountGet[0].Location
@@ -259,7 +259,7 @@ function Test-DataLakeAnalyticsJob
259259
break
260260
}
261261

262-
Write-Host "account not yet provisioned. current state: $($accountGet[0].Properties.ProvisioningState)"
262+
Write-Host "account not yet provisioned. current state: $($accountGet[0].ProvisioningState)"
263263
[Microsoft.Rest.ClientRuntime.Azure.TestFramework.TestUtilities]::Wait(30000)
264264
Assert-False {$i -eq 60} "dataLakeAnalytics accounts not in succeeded state even after 30 min."
265265
}
@@ -342,7 +342,7 @@ function Test-NegativeDataLakeAnalyticsAccount
342342
for ($i = 0; $i -le 60; $i++)
343343
{
344344
[array]$accountGet = Get-AdlAnalyticsAccount -ResourceGroupName $resourceGroupName -Name $accountName
345-
if ($accountGet[0].Properties.ProvisioningState -like "Succeeded")
345+
if ($accountGet[0].ProvisioningState -like "Succeeded")
346346
{
347347
Assert-AreEqual $accountName $accountGet[0].Name
348348
Assert-AreEqual $location $accountGet[0].Location
@@ -351,7 +351,7 @@ function Test-NegativeDataLakeAnalyticsAccount
351351
break
352352
}
353353

354-
Write-Host "account not yet provisioned. current state: $($accountGet[0].Properties.ProvisioningState)"
354+
Write-Host "account not yet provisioned. current state: $($accountGet[0].ProvisioningState)"
355355
[Microsoft.Rest.ClientRuntime.Azure.TestFramework.TestUtilities]::Wait(30000)
356356
Assert-False {$i -eq 60} "dataLakeAnalytics accounts not in succeeded state even after 30 min."
357357
}
@@ -405,7 +405,7 @@ function Test-NegativeDataLakeAnalyticsJob
405405
New-AzureRmResourceGroup -Name $resourceGroupName -Location $location
406406
New-AdlStore -ResourceGroupName $resourceGroupName -Name $dataLakeAccountName -Location $location
407407
$accountCreated = New-AdlAnalyticsAccount -ResourceGroupName $resourceGroupName -Name $accountName -Location $location -DefaultDataLakeStore $dataLakeAccountName
408-
$nowTime = $accountCreated.Properties.CreationTime
408+
$nowTime = $accountCreated.CreationTime
409409
Assert-AreEqual $accountName $accountCreated.Name
410410
Assert-AreEqual $location $accountCreated.Location
411411
Assert-AreEqual "Microsoft.DataLakeAnalytics/accounts" $accountCreated.Type
@@ -415,7 +415,7 @@ function Test-NegativeDataLakeAnalyticsJob
415415
for ($i = 0; $i -le 60; $i++)
416416
{
417417
[array]$accountGet = Get-AdlAnalyticsAccount -ResourceGroupName $resourceGroupName -Name $accountName
418-
if ($accountGet[0].Properties.ProvisioningState -like "Succeeded")
418+
if ($accountGet[0].ProvisioningState -like "Succeeded")
419419
{
420420
Assert-AreEqual $accountName $accountGet[0].Name
421421
Assert-AreEqual $location $accountGet[0].Location
@@ -424,7 +424,7 @@ function Test-NegativeDataLakeAnalyticsJob
424424
break
425425
}
426426

427-
Write-Host "account not yet provisioned. current state: $($accountGet[0].Properties.ProvisioningState)"
427+
Write-Host "account not yet provisioned. current state: $($accountGet[0].ProvisioningState)"
428428
[Microsoft.Rest.ClientRuntime.Azure.TestFramework.TestUtilities]::Wait(30000)
429429
Assert-False {$i -eq 60} "dataLakeAnalytics accounts not in succeeded state even after 30 min."
430430
}
@@ -495,7 +495,7 @@ function Test-DataLakeAnalyticsCatalog
495495
for ($i = 0; $i -le 60; $i++)
496496
{
497497
[array]$accountGet = Get-AdlAnalyticsAccount -ResourceGroupName $resourceGroupName -Name $accountName
498-
if ($accountGet[0].Properties.ProvisioningState -like "Succeeded")
498+
if ($accountGet[0].ProvisioningState -like "Succeeded")
499499
{
500500
Assert-AreEqual $accountName $accountGet[0].Name
501501
Assert-AreEqual $location $accountGet[0].Location
@@ -504,7 +504,7 @@ function Test-DataLakeAnalyticsCatalog
504504
break
505505
}
506506

507-
Write-Host "account not yet provisioned. current state: $($accountGet[0].Properties.ProvisioningState)"
507+
Write-Host "account not yet provisioned. current state: $($accountGet[0].ProvisioningState)"
508508
[Microsoft.Rest.ClientRuntime.Azure.TestFramework.TestUtilities]::Wait(30000)
509509
Assert-False {$i -eq 60} "dataLakeAnalytics accounts not in succeeded state even after 30 min."
510510
}

‎src/ResourceManager/DataLakeAnalytics/Commands.DataLakeAnalytics.Test/ScenarioTests/AdlaTests.ps1

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ function Test-DataLakeAnalyticsAccount
3838
for ($i = 0; $i -le 60; $i++)
3939
{
4040
[array]$accountGet = Get-AzureRmDataLakeAnalyticsAccount -ResourceGroupName $resourceGroupName -Name $accountName
41-
if ($accountGet[0].Properties.ProvisioningState -like "Succeeded")
41+
if ($accountGet[0].ProvisioningState -like "Succeeded")
4242
{
4343
Assert-AreEqual $accountName $accountGet[0].Name
4444
Assert-AreEqual $location $accountGet[0].Location
@@ -47,7 +47,7 @@ function Test-DataLakeAnalyticsAccount
4747
break
4848
}
4949

50-
Write-Host "account not yet provisioned. current state: $($accountGet[0].Properties.ProvisioningState)"
50+
Write-Host "account not yet provisioned. current state: $($accountGet[0].ProvisioningState)"
5151
[Microsoft.Rest.ClientRuntime.Azure.TestFramework.TestUtilities]::Wait(30000)
5252
Assert-False {$i -eq 60} "dataLakeAnalytics account is not in succeeded state even after 30 min."
5353
}
@@ -111,7 +111,7 @@ function Test-DataLakeAnalyticsAccount
111111

112112
# get the account and ensure that it contains two data lake stores
113113
$testStoreAdd = Get-AzureRmDataLakeAnalyticsAccount -Name $accountName
114-
Assert-AreEqual 2 $testStoreAdd.Properties.DataLakeStoreAccounts.Count
114+
Assert-AreEqual 2 $testStoreAdd.DataLakeStoreAccounts.Count
115115

116116
# get the specific data source added
117117
$adlsAccountInfo = Get-AzureRmDataLakeAnalyticsDataSource -Account $accountName -DataLakeStore $secondDataLakeAccountName
@@ -126,14 +126,14 @@ function Test-DataLakeAnalyticsAccount
126126

127127
# get the account and ensure that it contains one data lake store
128128
$testStoreAdd = Get-AzureRmDataLakeAnalyticsAccount -Name $accountName
129-
Assert-AreEqual 1 $testStoreAdd.Properties.DataLakeStoreAccounts.Count
129+
Assert-AreEqual 1 $testStoreAdd.DataLakeStoreAccounts.Count
130130

131131
# add a blob account to the analytics account
132132
Add-AzureRmDataLakeAnalyticsDataSource -Account $accountName -Blob $blobAccountName -AccessKey $blobAccountKey
133133

134134
# get the account and ensure that it contains one blob account
135135
$testStoreAdd = Get-AzureRmDataLakeAnalyticsAccount -Name $accountName
136-
Assert-AreEqual 1 $testStoreAdd.Properties.StorageAccounts.Count
136+
Assert-AreEqual 1 $testStoreAdd.StorageAccounts.Count
137137

138138
# get the specific data source added
139139
$blobAccountInfo = Get-AzureRmDataLakeAnalyticsDataSource -Account $accountName -Blob $blobAccountName
@@ -148,7 +148,7 @@ function Test-DataLakeAnalyticsAccount
148148

149149
# get the account and ensure that it contains no azure storage accounts
150150
$testStoreAdd = Get-AzureRmDataLakeAnalyticsAccount -Name $accountName
151-
Assert-True {$testStoreAdd.Properties.StorageAccounts -eq $null -or $testStoreAdd.Properties.StorageAccounts.Count -eq 0} "Remove blob storage reported success but failed to remove the account."
151+
Assert-True {$testStoreAdd.StorageAccounts -eq $null -or $testStoreAdd.StorageAccounts.Count -eq 0} "Remove blob storage reported success but failed to remove the account."
152152

153153
# Delete dataLakeAnalytics account
154154
Assert-True {Remove-AzureRmDataLakeAnalyticsAccount -ResourceGroupName $resourceGroupName -Name $accountName -Force -PassThru} "Remove Account failed."
@@ -239,7 +239,7 @@ function Test-DataLakeAnalyticsJob
239239
New-AzureRmResourceGroup -Name $resourceGroupName -Location $location
240240
New-AzureRmDataLakeStoreAccount -ResourceGroupName $resourceGroupName -Name $dataLakeAccountName -Location $location
241241
$accountCreated = New-AzureRmDataLakeAnalyticsAccount -ResourceGroupName $resourceGroupName -Name $accountName -Location $location -DefaultDataLakeStore $dataLakeAccountName
242-
$nowTime = $accountCreated.Properties.CreationTime
242+
$nowTime = $accountCreated.CreationTime
243243

244244
Assert-AreEqual $accountName $accountCreated.Name
245245
Assert-AreEqual $location $accountCreated.Location
@@ -250,7 +250,7 @@ function Test-DataLakeAnalyticsJob
250250
for ($i = 0; $i -le 60; $i++)
251251
{
252252
[array]$accountGet = Get-AzureRmDataLakeAnalyticsAccount -ResourceGroupName $resourceGroupName -Name $accountName
253-
if ($accountGet[0].Properties.ProvisioningState -like "Succeeded")
253+
if ($accountGet[0].ProvisioningState -like "Succeeded")
254254
{
255255
Assert-AreEqual $accountName $accountGet[0].Name
256256
Assert-AreEqual $location $accountGet[0].Location
@@ -259,7 +259,7 @@ function Test-DataLakeAnalyticsJob
259259
break
260260
}
261261

262-
Write-Host "account not yet provisioned. current state: $($accountGet[0].Properties.ProvisioningState)"
262+
Write-Host "account not yet provisioned. current state: $($accountGet[0].ProvisioningState)"
263263
[Microsoft.Rest.ClientRuntime.Azure.TestFramework.TestUtilities]::Wait(30000)
264264
Assert-False {$i -eq 60} "dataLakeAnalytics accounts not in succeeded state even after 30 min."
265265
}
@@ -340,7 +340,7 @@ function Test-NegativeDataLakeAnalyticsAccount
340340
for ($i = 0; $i -le 60; $i++)
341341
{
342342
[array]$accountGet = Get-AzureRmDataLakeAnalyticsAccount -ResourceGroupName $resourceGroupName -Name $accountName
343-
if ($accountGet[0].Properties.ProvisioningState -like "Succeeded")
343+
if ($accountGet[0].ProvisioningState -like "Succeeded")
344344
{
345345
Assert-AreEqual $accountName $accountGet[0].Name
346346
Assert-AreEqual $location $accountGet[0].Location
@@ -349,7 +349,7 @@ function Test-NegativeDataLakeAnalyticsAccount
349349
break
350350
}
351351

352-
Write-Host "account not yet provisioned. current state: $($accountGet[0].Properties.ProvisioningState)"
352+
Write-Host "account not yet provisioned. current state: $($accountGet[0].ProvisioningState)"
353353
[Microsoft.Rest.ClientRuntime.Azure.TestFramework.TestUtilities]::Wait(30000)
354354
Assert-False {$i -eq 60} "dataLakeAnalytics accounts not in succeeded state even after 30 min."
355355
}
@@ -403,7 +403,7 @@ function Test-NegativeDataLakeAnalyticsJob
403403
New-AzureRmResourceGroup -Name $resourceGroupName -Location $location
404404
New-AzureRmDataLakeStoreAccount -ResourceGroupName $resourceGroupName -Name $dataLakeAccountName -Location $location
405405
$accountCreated = New-AzureRmDataLakeAnalyticsAccount -ResourceGroupName $resourceGroupName -Name $accountName -Location $location -DefaultDataLakeStore $dataLakeAccountName
406-
$nowTime = $accountCreated.Properties.CreationTime
406+
$nowTime = $accountCreated.CreationTime
407407
Assert-AreEqual $accountName $accountCreated.Name
408408
Assert-AreEqual $location $accountCreated.Location
409409
Assert-AreEqual "Microsoft.DataLakeAnalytics/accounts" $accountCreated.Type
@@ -413,7 +413,7 @@ function Test-NegativeDataLakeAnalyticsJob
413413
for ($i = 0; $i -le 60; $i++)
414414
{
415415
[array]$accountGet = Get-AzureRmDataLakeAnalyticsAccount -ResourceGroupName $resourceGroupName -Name $accountName
416-
if ($accountGet[0].Properties.ProvisioningState -like "Succeeded")
416+
if ($accountGet[0].ProvisioningState -like "Succeeded")
417417
{
418418
Assert-AreEqual $accountName $accountGet[0].Name
419419
Assert-AreEqual $location $accountGet[0].Location
@@ -422,7 +422,7 @@ function Test-NegativeDataLakeAnalyticsJob
422422
break
423423
}
424424

425-
Write-Host "account not yet provisioned. current state: $($accountGet[0].Properties.ProvisioningState)"
425+
Write-Host "account not yet provisioned. current state: $($accountGet[0].ProvisioningState)"
426426
[Microsoft.Rest.ClientRuntime.Azure.TestFramework.TestUtilities]::Wait(30000)
427427
Assert-False {$i -eq 60} "dataLakeAnalytics accounts not in succeeded state even after 30 min."
428428
}
@@ -493,7 +493,7 @@ function Test-DataLakeAnalyticsCatalog
493493
for ($i = 0; $i -le 60; $i++)
494494
{
495495
[array]$accountGet = Get-AzureRmDataLakeAnalyticsAccount -ResourceGroupName $resourceGroupName -Name $accountName
496-
if ($accountGet[0].Properties.ProvisioningState -like "Succeeded")
496+
if ($accountGet[0].ProvisioningState -like "Succeeded")
497497
{
498498
Assert-AreEqual $accountName $accountGet[0].Name
499499
Assert-AreEqual $location $accountGet[0].Location
@@ -502,7 +502,7 @@ function Test-DataLakeAnalyticsCatalog
502502
break
503503
}
504504

505-
Write-Host "account not yet provisioned. current state: $($accountGet[0].Properties.ProvisioningState)"
505+
Write-Host "account not yet provisioned. current state: $($accountGet[0].ProvisioningState)"
506506
[Microsoft.Rest.ClientRuntime.Azure.TestFramework.TestUtilities]::Wait(30000)
507507
Assert-False {$i -eq 60} "dataLakeAnalytics accounts not in succeeded state even after 30 min."
508508
}

0 commit comments

Comments
 (0)