Skip to content

Commit 3e0d8f7

Browse files
begoldsmmarkcowl
authored andcommitted
ADL PowerShell Updates (#2511)
* Update PowerShell to use the latest SDK * Missed DataLakeStore upgrade. * Updates for file and folder download. Tests will be in the next iteration. * Fixing the connection manager overwriting. This is important to ensure that we have enough connections available for ingress/egress scenarios, and it must be set before the client is first used. * Updating the help for ADLS to include new download. * Signed local package for testing. * Add full path property to ADLS Items * Remove private package. Official is published * Adding official package from nuget. * Missed one disable of tracing. * Fixing ADL tests and re-running them This enables ADL tests to run during CI and gets them totally updated. * fix to always copy ADL session records. * Add links to AzureRM.Resources.ps1 Following the pattern from compute tests. * Adding records directory info for mock server This is a requirement for the tests to be discovered when run in playback mode. * Fix ADL tests and update changelog This updates the change log to reflect the changes made Fixes to datetime offset for listing jobs fix to import/export logic due to inverted parameters. * Missed one of the test updates * test fixes for ADLA and ADLS * Add specific exclusion for ADL acls Inside of ACLs we allow ":", which breaks the playback of tests, since it encodes ":", which results in a missed match in the recorded json (which contains the colon). This fixes that so playback does not encode colons for paths that start with: /webhdfs/v1/?aclspec
1 parent 4628bef commit 3e0d8f7

File tree

47 files changed

+26963
-25533
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+26963
-25533
lines changed

AzurePowershell.Test.targets

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,10 +91,10 @@
9191
<XUnitTests Include=".\src\ResourceManager\CognitiveServices\CognitiveServices.Test\bin\Debug\Microsoft.Azure.Commands.Management.CognitiveServices.Test.dll"/>
9292
<XUnitTests Include=".\src\ResourceManager\Automation\Commands.Automation.Test\bin\Debug\Microsoft.Azure.Commands.ResourceManager.Automation.Test.dll"/>
9393
<XUnitTests Include=".\src\ResourceManager\PowerBIEmbedded\Commands.PowerBIEmbedded.Test\bin\Debug\Microsoft.Azure.Commands.PowerBIEmbedded.Test.dll"/>
94-
<!-- <XUnitTests Include=".\src\ResourceManager\AzureStackAdmin\Commands.AzureStackAdmin.Test\bin\Debug\Microsoft.AzureStack.Commands.Admin.Test.dll"/>
95-
<XUnitTests Include=".\src\ResourceManager\AzureStackStorage\Commands.AzureStackStorage.Tests\bin\Debug\Microsoft.AzureStack.Commands.StorageAdmin.Test.dll"/>
9694
<XUnitTests Include=".\src\ResourceManager\DataLakeAnalytics\Commands.DataLakeAnalytics.Test\bin\Debug\Microsoft.Azure.Commands.DataLakeAnalytics.Test.dll"/>
9795
<XUnitTests Include=".\src\ResourceManager\DataLakeStore\Commands.DataLakeStore.Test\bin\Debug\Microsoft.Azure.Commands.DataLake.Test.dll"/>
96+
<!-- <XUnitTests Include=".\src\ResourceManager\AzureStackAdmin\Commands.AzureStackAdmin.Test\bin\Debug\Microsoft.AzureStack.Commands.Admin.Test.dll"/>
97+
<XUnitTests Include=".\src\ResourceManager\AzureStackStorage\Commands.AzureStackStorage.Tests\bin\Debug\Microsoft.AzureStack.Commands.StorageAdmin.Test.dll"/>
9898
<XUnitTests Include=".\src\ResourceManager\DevTestLabs\Commands.DevTestLabs.Test\bin\Debug\Microsoft.Azure.Commands.DevTestLabs.Test.dll"/>
9999
<XUnitTests Include=".\src\ResourceManager\HDInsight\Commands.HDInsight.Test\bin\Debug\Commands.HDInsight.Test.dll"/>
100100
<XUnitTests Include=".\src\ResourceManager\Insights\Commands.Insights.Test\bin\Debug\Microsoft.Azure.Commands.Insights.Test.dll"/>

ChangeLog.md

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,20 @@
77
* Set-AzureRmSqlDatabaseBackupLongTermRetentionPolicy
88
* Restore-AzureRmSqlDatabase now supports point-in-time restore of a deleted database
99
* Restore-AzureRmSqlDatabase now supports restoring from a Long Term Retention backup
10+
* Azure Data Lake Store
11+
* Drastically improve performance of file and folder upload and download.
12+
* This includes a slight change to the parameter names for download and inclusion of two new parameters for upload:
13+
* NumThreads -> PerFileThreadCount, used to indicate the number of threads to use in a single file
14+
* ConcurrentFileCount, used to indicate the number of files to upload/download in parallel for folder upload/download.
15+
* Default threading values are now designed to give a better all around throughput for most file sizes. If performance is not as desired, the values above can be modified to meet requirements.
16+
* Azure Data Lake Analytics
17+
* Get-AzureRMDataLakeAnalyticsDataSource now returns all data sources when called with no arguments.
18+
* This change also removes the data source type parameter from the cmdlet.
19+
* This change results in a new object being returned for the list operation with the following properties:
20+
* Type, the type of data source
21+
* Name, the name of the data source
22+
* IsDefault, set to true if this is the default data source for the account
23+
* Get-AzureRMDataLakeAnalyticsJob fixed for list for certain date time offset values when filtering on submittedBefore and submittedAfter.
1024
##2016.06.23 version 1.5.1
1125
* Azure Resource Manager
1226
- Fix a bug in New-AzureRmResourceGroupDeployment. In some deployments the cmdlet throws an exception with "Deployment 'deploymentName' could not be found." and causes the cmdlet to fail. The fix makes sure the deployment is created before getting operations.

src/ResourceManager/Common/Commands.ScenarioTests.ResourceManager.Common/PermissiveRecordMatcherWithApiExclusion.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,8 @@ private bool ContainsIgnoredProvider(string requestUri, out string version)
113113
!requestUri.StartsWith("/jobs", StringComparison.InvariantCultureIgnoreCase) &&
114114
!requestUri.StartsWith("/jobschedules", StringComparison.InvariantCultureIgnoreCase) &&
115115
!requestUri.Contains("/applications?") &&
116-
!requestUri.Contains("/servicePrincipals?"))
116+
!requestUri.Contains("/servicePrincipals?") &&
117+
!requestUri.StartsWith("/webhdfs/v1/?aclspec", StringComparison.InvariantCultureIgnoreCase))
117118
{
118119
version = String.Empty;
119120
return true;

src/ResourceManager/DataLakeAnalytics/Commands.DataLakeAnalytics.Test/Commands.DataLakeAnalytics.Test.csproj

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -64,12 +64,12 @@
6464
</Reference>
6565
<Reference Include="Microsoft.Azure.Management.DataLake.Analytics, Version=0.11.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
6666
<SpecificVersion>False</SpecificVersion>
67-
<HintPath>..\..\..\packages\Microsoft.Azure.Management.DataLake.Analytics.0.11.3-preview\lib\net45\Microsoft.Azure.Management.DataLake.Analytics.dll</HintPath>
67+
<HintPath>..\..\..\packages\Microsoft.Azure.Management.DataLake.Analytics.0.11.5-preview\lib\net45\Microsoft.Azure.Management.DataLake.Analytics.dll</HintPath>
6868
<Private>True</Private>
6969
</Reference>
7070
<Reference Include="Microsoft.Azure.Management.DataLake.Store, Version=0.12.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
7171
<SpecificVersion>False</SpecificVersion>
72-
<HintPath>..\..\..\packages\Microsoft.Azure.Management.DataLake.Store.0.12.0-preview\lib\net45\Microsoft.Azure.Management.DataLake.Store.dll</HintPath>
72+
<HintPath>..\..\..\packages\Microsoft.Azure.Management.DataLake.Store.0.12.2-preview\lib\net45\Microsoft.Azure.Management.DataLake.Store.dll</HintPath>
7373
<Private>True</Private>
7474
</Reference>
7575
<Reference Include="Microsoft.Azure.Management.ResourceManager, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
@@ -209,6 +209,9 @@
209209
<None Include="packages.config">
210210
<SubType>Designer</SubType>
211211
</None>
212+
<None Include="..\..\Common\Commands.ScenarioTests.ResourceManager.Common\AzureRM.Resources.ps1">
213+
<Link>ScenarioTests\AzureRM.Resources.ps1</Link>
214+
</None>
212215
<None Include="ScenarioTests\AdlaAliasTests.ps1">
213216
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
214217
</None>
@@ -219,19 +222,19 @@
219222
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
220223
</None>
221224
<None Include="SessionRecords\Microsoft.Azure.Commands.DataLakeAnalytics.Test.ScenarioTests.AdlaAliasTests\TestAdlaAccount.json">
222-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
225+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
223226
</None>
224227
<None Include="SessionRecords\Microsoft.Azure.Commands.DataLakeAnalytics.Test.ScenarioTests.AdlaAliasTests\TestAdlaCatalog.json">
225-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
228+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
226229
</None>
227230
<None Include="SessionRecords\Microsoft.Azure.Commands.DataLakeAnalytics.Test.ScenarioTests.AdlaAliasTests\TestAdlaJob.json">
228-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
231+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
229232
</None>
230233
<None Include="SessionRecords\Microsoft.Azure.Commands.DataLakeAnalytics.Test.ScenarioTests.AdlaAliasTests\TestNegativeAdlaAccount.json">
231-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
234+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
232235
</None>
233236
<None Include="SessionRecords\Microsoft.Azure.Commands.DataLakeAnalytics.Test.ScenarioTests.AdlaAliasTests\TestNegativeAdlaJob.json">
234-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
237+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
235238
</None>
236239
<None Include="SessionRecords\Microsoft.Azure.Commands.DataLakeAnalytics.Test.ScenarioTests.AdlaTests\TestAdlaAccount.json">
237240
<CopyToOutputDirectory>Always</CopyToOutputDirectory>

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

Lines changed: 17 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@ function Test-DataLakeAnalyticsJob
186186
New-AzureRmResourceGroup -Name $resourceGroupName -Location $location
187187
New-AdlStore -ResourceGroupName $resourceGroupName -Name $dataLakeAccountName -Location $location
188188
$accountCreated = New-AdlAnalyticsAccount -ResourceGroupName $resourceGroupName -Name $accountName -Location $location -DefaultDataLakeStore $dataLakeAccountName
189-
189+
$nowTime = $accountCreated.Properties.CreationTime
190190
Assert-AreEqual $accountName $accountCreated.Name
191191
Assert-AreEqual $location $accountCreated.Location
192192
Assert-AreEqual "Microsoft.DataLakeAnalytics/accounts" $accountCreated.Type
@@ -214,6 +214,9 @@ function Test-DataLakeAnalyticsJob
214214
# Wait for two minutes and 30 seconds prior to attempting to submit the job in the freshly created account.
215215
[Microsoft.Rest.ClientRuntime.Azure.TestFramework.TestUtilities]::Wait(150000)
216216
# submit a job
217+
$guidForJob = [Microsoft.Rest.ClientRuntime.Azure.TestFramework.TestUtilities]::GenerateGuid("jobTest02")
218+
[Microsoft.Azure.Commands.DataLakeAnalytics.Models.DataLakeAnalyticsClient]::JobIdQueue.Enqueue($guidForJob)
219+
217220
$jobInfo = Submit-AdlJob -AccountName $accountName -Name "TestJob" -Script "DROP DATABASE IF EXISTS foo; CREATE DATABASE foo;"
218221
Assert-NotNull {$jobInfo}
219222

@@ -229,11 +232,12 @@ function Test-DataLakeAnalyticsJob
229232

230233
Assert-NotNull {Get-AdlJob -AccountName $accountName}
231234

232-
$jobsWithDateOffset = Get-AdlJob -AccountName $accountName -SubmittedAfter $(([DateTime]::Now).AddMinutes(-5))
235+
$jobsWithDateOffset = Get-AdlJob -AccountName $accountName -SubmittedAfter $([DateTimeOffset]($nowTime).AddMinutes(-5))
233236

234237
Assert-True {$jobsWithDateOffset.Count -gt 0} "Failed to retrieve jobs submitted after five miuntes ago"
235-
236-
$jobsWithDateOffset = Get-AdlJob -AccountName $accountName -SubmittedBefore $(([DateTime]::Now).AddMinutes(0))
238+
239+
# we add five minutes to ensure that the timing is right, since we are using the account creation time, and not truly "now"
240+
$jobsWithDateOffset = Get-AdlJob -AccountName $accountName -SubmittedBefore $([DateTimeOffset]($nowTime).AddMinutes(5))
237241

238242
Assert-True {$jobsWithDateOffset.Count -gt 0} "Failed to retrieve jobs submitted before right now"
239243

@@ -274,7 +278,7 @@ function Test-NegativeDataLakeAnalyticsAccount
274278
New-AzureRmResourceGroup -Name $resourceGroupName -Location $location
275279
New-AdlStore -ResourceGroupName $resourceGroupName -Name $dataLakeAccountName -Location $location
276280
$accountCreated = New-AdlAnalyticsAccount -ResourceGroupName $resourceGroupName -Name $accountName -Location $location -DefaultDataLakeStore $dataLakeAccountName
277-
281+
278282
Assert-AreEqual $accountName $accountCreated.Name
279283
Assert-AreEqual $location $accountCreated.Location
280284
Assert-AreEqual "Microsoft.DataLakeAnalytics/accounts" $accountCreated.Type
@@ -347,7 +351,7 @@ function Test-NegativeDataLakeAnalyticsJob
347351
New-AzureRmResourceGroup -Name $resourceGroupName -Location $location
348352
New-AdlStore -ResourceGroupName $resourceGroupName -Name $dataLakeAccountName -Location $location
349353
$accountCreated = New-AdlAnalyticsAccount -ResourceGroupName $resourceGroupName -Name $accountName -Location $location -DefaultDataLakeStore $dataLakeAccountName
350-
354+
$nowTime = $accountCreated.Properties.CreationTime
351355
Assert-AreEqual $accountName $accountCreated.Name
352356
Assert-AreEqual $location $accountCreated.Location
353357
Assert-AreEqual "Microsoft.DataLakeAnalytics/accounts" $accountCreated.Type
@@ -380,7 +384,7 @@ function Test-NegativeDataLakeAnalyticsJob
380384
# Attempt to Get debug data for a non-existent job
381385
Assert-Throws {Get-AdlJobDebugInfo -AccountName $accountName -JobIdentity [Guid]::Empty}
382386

383-
$jobsWithDateOffset = Get-AdlJob -AccountName $accountName -SubmittedAfter $([DateTime]::Now)
387+
$jobsWithDateOffset = Get-AdlJob -AccountName $accountName -SubmittedAfter $([DateTimeOffset]$nowTime)
384388

385389
Assert-True {$jobsWithDateOffset.Count -eq 0} "Retrieval of jobs submitted after right now returned results and should not have"
386390

@@ -549,6 +553,8 @@ function Test-DataLakeAnalyticsCatalog
549553
"@
550554
# run the script
551555
$scriptToRun = [string]::Format($scriptTemplate, $databaseName, $tableName, $tvfName, $viewName, $procName)
556+
$guidForJob = [Microsoft.Rest.ClientRuntime.Azure.TestFramework.TestUtilities]::GenerateGuid("catalogCreationJob01")
557+
[Microsoft.Azure.Commands.DataLakeAnalytics.Models.DataLakeAnalyticsClient]::JobIdQueue.Enqueue($guidForJob)
552558
$jobInfo = Submit-AdlJob -AccountName $accountName -Name "TestJob" -Script $scriptToRun
553559
$result = Wait-AdlJob -AccountName $accountName -JobId $jobInfo.JobId
554560
Assert-AreEqual "Succeeded" $result.Result
@@ -706,6 +712,8 @@ function Test-DataLakeAnalyticsCatalog
706712
"@
707713
$credentialJob = [string]::Format($credentialJobTemplate, $databaseName, $credentialName, $secretName)
708714

715+
$guidForJob = [Microsoft.Rest.ClientRuntime.Azure.TestFramework.TestUtilities]::GenerateGuid("credentialCreateJob01")
716+
[Microsoft.Azure.Commands.DataLakeAnalytics.Models.DataLakeAnalyticsClient]::JobIdQueue.Enqueue($guidForJob)
709717
$jobInfo = Submit-AdlJob -AccountName $accountName -Name "TestJobCredential" -Script $credentialJob
710718
$result = Wait-AdlJob -AccountName $accountName -JobId $jobInfo.JobId
711719
Assert-AreEqual "Succeeded" $result.Result
@@ -737,7 +745,8 @@ function Test-DataLakeAnalyticsCatalog
737745
DROP CREDENTIAL {1};
738746
"@
739747
$credentialJob = [string]::Format($credentialJobTemplate, $databaseName, $credentialName)
740-
748+
$guidForJob = [Microsoft.Rest.ClientRuntime.Azure.TestFramework.TestUtilities]::GenerateGuid("credentialDropJob01")
749+
[Microsoft.Azure.Commands.DataLakeAnalytics.Models.DataLakeAnalyticsClient]::JobIdQueue.Enqueue($guidForJob)
741750
$jobInfo = Submit-AdlJob -AccountName $accountName -Name "TestJobCredential" -Script $credentialJob
742751
$result = Wait-AdlJob -AccountName $accountName -JobId $jobInfo.JobId
743752
Assert-AreEqual "Succeeded" $result.Result

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

Lines changed: 18 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,8 @@ function Test-DataLakeAnalyticsJob
186186
New-AzureRmResourceGroup -Name $resourceGroupName -Location $location
187187
New-AzureRmDataLakeStoreAccount -ResourceGroupName $resourceGroupName -Name $dataLakeAccountName -Location $location
188188
$accountCreated = New-AzureRmDataLakeAnalyticsAccount -ResourceGroupName $resourceGroupName -Name $accountName -Location $location -DefaultDataLakeStore $dataLakeAccountName
189-
189+
$nowTime = $accountCreated.Properties.CreationTime
190+
190191
Assert-AreEqual $accountName $accountCreated.Name
191192
Assert-AreEqual $location $accountCreated.Location
192193
Assert-AreEqual "Microsoft.DataLakeAnalytics/accounts" $accountCreated.Type
@@ -214,6 +215,8 @@ function Test-DataLakeAnalyticsJob
214215
# Wait for two minutes and 30 seconds prior to attempting to submit the job in the freshly created account.
215216
[Microsoft.Rest.ClientRuntime.Azure.TestFramework.TestUtilities]::Wait(150000)
216217
# submit a job
218+
$guidForJob = [Microsoft.Rest.ClientRuntime.Azure.TestFramework.TestUtilities]::GenerateGuid("jobTest01")
219+
[Microsoft.Azure.Commands.DataLakeAnalytics.Models.DataLakeAnalyticsClient]::JobIdQueue.Enqueue($guidForJob)
217220
$jobInfo = Submit-AzureRmDataLakeAnalyticsJob -AccountName $accountName -Name "TestJob" -Script "DROP DATABASE IF EXISTS foo; CREATE DATABASE foo;"
218221
Assert-NotNull {$jobInfo}
219222

@@ -229,11 +232,11 @@ function Test-DataLakeAnalyticsJob
229232

230233
Assert-NotNull {Get-AzureRmDataLakeAnalyticsJob -AccountName $accountName}
231234

232-
$jobsWithDateOffset = Get-AzureRmDataLakeAnalyticsJob -AccountName $accountName -SubmittedAfter $(([DateTime]::Now).AddMinutes(-5))
235+
$jobsWithDateOffset = Get-AzureRmDataLakeAnalyticsJob -AccountName $accountName -SubmittedAfter $([DateTimeOffset]($nowTime).AddMinutes(-5))
233236

234237
Assert-True {$jobsWithDateOffset.Count -gt 0} "Failed to retrieve jobs submitted after five miuntes ago"
235-
236-
$jobsWithDateOffset = Get-AzureRmDataLakeAnalyticsJob -AccountName $accountName -SubmittedBefore $(([DateTime]::Now).AddMinutes(0))
238+
# we add five minutes to ensure that the timing is right, since we are using the account creation time, and not truly "now"
239+
$jobsWithDateOffset = Get-AzureRmDataLakeAnalyticsJob -AccountName $accountName -SubmittedBefore $([DateTimeOffset]($nowTime).AddMinutes(5))
237240

238241
Assert-True {$jobsWithDateOffset.Count -gt 0} "Failed to retrieve jobs submitted before right now"
239242

@@ -347,7 +350,7 @@ function Test-NegativeDataLakeAnalyticsJob
347350
New-AzureRmResourceGroup -Name $resourceGroupName -Location $location
348351
New-AzureRmDataLakeStoreAccount -ResourceGroupName $resourceGroupName -Name $dataLakeAccountName -Location $location
349352
$accountCreated = New-AzureRmDataLakeAnalyticsAccount -ResourceGroupName $resourceGroupName -Name $accountName -Location $location -DefaultDataLakeStore $dataLakeAccountName
350-
353+
$nowTime = $accountCreated.Properties.CreationTime
351354
Assert-AreEqual $accountName $accountCreated.Name
352355
Assert-AreEqual $location $accountCreated.Location
353356
Assert-AreEqual "Microsoft.DataLakeAnalytics/accounts" $accountCreated.Type
@@ -380,7 +383,7 @@ function Test-NegativeDataLakeAnalyticsJob
380383
# Attempt to Get debug data for a non-existent job
381384
Assert-Throws {Get-AzureRmDataLakeAnalyticsJobDebugInfo -AccountName $accountName -JobIdentity [Guid]::Empty}
382385

383-
$jobsWithDateOffset = Get-AzureRmDataLakeAnalyticsJob -AccountName $accountName -SubmittedAfter $([DateTime]::Now)
386+
$jobsWithDateOffset = Get-AzureRmDataLakeAnalyticsJob -AccountName $accountName -SubmittedAfter $([DateTimeOffset]$nowTime)
384387

385388
Assert-True {$jobsWithDateOffset.Count -eq 0} "Retrieval of jobs submitted after right now returned results and should not have"
386389

@@ -549,6 +552,10 @@ function Test-DataLakeAnalyticsCatalog
549552
"@
550553
# run the script
551554
$scriptToRun = [string]::Format($scriptTemplate, $databaseName, $tableName, $tvfName, $viewName, $procName)
555+
556+
$guidForJob = [Microsoft.Rest.ClientRuntime.Azure.TestFramework.TestUtilities]::GenerateGuid("createCatalogJob01")
557+
[Microsoft.Azure.Commands.DataLakeAnalytics.Models.DataLakeAnalyticsClient]::JobIdQueue.Enqueue($guidForJob)
558+
552559
$jobInfo = Submit-AzureRmDataLakeAnalyticsJob -AccountName $accountName -Name "TestJob" -Script $scriptToRun
553560
$result = Wait-AzureRMDataLakeAnalyticsJob -AccountName $accountName -JobId $jobInfo.JobId
554561
Assert-AreEqual "Succeeded" $result.Result
@@ -705,7 +712,9 @@ function Test-DataLakeAnalyticsCatalog
705712
CREATE CREDENTIAL {1} WITH USER_NAME = "scope@rkm4grspxa", IDENTITY = "{2}";
706713
"@
707714
$credentialJob = [string]::Format($credentialJobTemplate, $databaseName, $credentialName, $secretName)
708-
715+
716+
$guidForJob = [Microsoft.Rest.ClientRuntime.Azure.TestFramework.TestUtilities]::GenerateGuid("createCredentialjob02")
717+
[Microsoft.Azure.Commands.DataLakeAnalytics.Models.DataLakeAnalyticsClient]::JobIdQueue.Enqueue($guidForJob)
709718
$jobInfo = Submit-AzureRmDataLakeAnalyticsJob -AccountName $accountName -Name "TestJobCredential" -Script $credentialJob
710719
$result = Wait-AzureRMDataLakeAnalyticsJob -AccountName $accountName -JobId $jobInfo.JobId
711720
Assert-AreEqual "Succeeded" $result.Result
@@ -737,7 +746,8 @@ function Test-DataLakeAnalyticsCatalog
737746
DROP CREDENTIAL {1};
738747
"@
739748
$credentialJob = [string]::Format($credentialJobTemplate, $databaseName, $credentialName)
740-
749+
$guidForJob = [Microsoft.Rest.ClientRuntime.Azure.TestFramework.TestUtilities]::GenerateGuid("dropCredentialJob02")
750+
[Microsoft.Azure.Commands.DataLakeAnalytics.Models.DataLakeAnalyticsClient]::JobIdQueue.Enqueue($guidForJob)
741751
$jobInfo = Submit-AzureRmDataLakeAnalyticsJob -AccountName $accountName -Name "TestJobCredential" -Script $credentialJob
742752
$result = Wait-AzureRMDataLakeAnalyticsJob -AccountName $accountName -JobId $jobInfo.JobId
743753
Assert-AreEqual "Succeeded" $result.Result

0 commit comments

Comments
 (0)