Skip to content

Commit f0d2eb3

Browse files
huangpfhuangpf
committed
Merge pull request Azure#254 from Azure/dev
.
2 parents f072110 + 57521bf commit f0d2eb3

File tree

57 files changed

+4711
-6157
lines changed

Some content is hidden

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

57 files changed

+4711
-6157
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@
6767
</Reference>
6868
<Reference Include="Microsoft.Azure.Management.DataLake.AnalyticsJob, Version=0.9.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
6969
<SpecificVersion>False</SpecificVersion>
70-
<HintPath>..\..\..\packages\Microsoft.Azure.Management.DataLake.AnalyticsJob.0.9.5-preview\lib\net40\Microsoft.Azure.Management.DataLake.AnalyticsJob.dll</HintPath>
70+
<HintPath>..\..\..\packages\Microsoft.Azure.Management.DataLake.AnalyticsJob.0.9.6-preview\lib\net40\Microsoft.Azure.Management.DataLake.AnalyticsJob.dll</HintPath>
7171
</Reference>
7272
<Reference Include="Microsoft.Azure.Management.DataLake.Store, Version=0.9.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
7373
<SpecificVersion>False</SpecificVersion>

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

Lines changed: 17 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ public class AdlaTests : AdlaTestsBase
2424
[Trait(Category.AcceptanceType, Category.CheckIn)]
2525
public void TestAdlaAccount()
2626
{
27-
RunPowerShellTest(
27+
RunPowerShellTest(true,
2828
string.Format(
2929
"Test-DataLakeAnalyticsAccount -resourceGroupName {0} -accountName {1} -dataLakeAccountName {2} -secondDataLakeAccountName {3} -blobAccountName {4} -blobAccountKey {5} -location '{6}'",
3030
this.resourceGroupName, this.dataLakeAnalyticsAccountName, this.dataLakeStoreAccountName,
@@ -36,7 +36,7 @@ public void TestAdlaAccount()
3636
[Trait(Category.AcceptanceType, Category.CheckIn)]
3737
public void TestAdlaCatalog()
3838
{
39-
RunPowerShellTest(
39+
RunPowerShellTest(false,
4040
string.Format(
4141
"Test-DataLakeAnalyticsCatalog -resourceGroupName {0} -accountName {1} -dataLakeAccountName {2} -databaseName {3} -tableName {4} -tvfName {5} -viewName {6} -procName {7} -secretName {8} -secretPwd {9} -credentialName {10} -location '{11}'",
4242
this.resourceGroupName, this.dataLakeAnalyticsAccountName, this.dataLakeStoreAccountName,
@@ -49,21 +49,33 @@ public void TestAdlaCatalog()
4949
[Trait(Category.AcceptanceType, Category.CheckIn)]
5050
public void TestAdlaJob()
5151
{
52-
RunPowerShellTest(string.Format("Test-DataLakeAnalyticsJob -resourceGroupName {0} -accountName {1} -dataLakeAccountName {2} -location '{3}'", this.resourceGroupName, this.dataLakeAnalyticsAccountName, this.dataLakeStoreAccountName, AdlaTestsBase.resourceGroupLocation));
52+
RunPowerShellTest(false,
53+
string.Format(
54+
"Test-DataLakeAnalyticsJob -resourceGroupName {0} -accountName {1} -dataLakeAccountName {2} -location '{3}'",
55+
this.resourceGroupName, this.dataLakeAnalyticsAccountName, this.dataLakeStoreAccountName,
56+
AdlaTestsBase.resourceGroupLocation));
5357
}
5458

5559
[Fact]
5660
[Trait(Category.AcceptanceType, Category.CheckIn)]
5761
public void TestNegativeAdlaAccount()
5862
{
59-
RunPowerShellTest(string.Format("Test-NegativeDataLakeAnalyticsAccount -resourceGroupName {0} -accountName {1} -dataLakeAccountName {2} -location '{3}'", this.resourceGroupName, this.dataLakeAnalyticsAccountName, this.dataLakeStoreAccountName, AdlaTestsBase.resourceGroupLocation));
63+
RunPowerShellTest(false,
64+
string.Format(
65+
"Test-NegativeDataLakeAnalyticsAccount -resourceGroupName {0} -accountName {1} -dataLakeAccountName {2} -location '{3}'",
66+
this.resourceGroupName, this.dataLakeAnalyticsAccountName, this.dataLakeStoreAccountName,
67+
AdlaTestsBase.resourceGroupLocation));
6068
}
6169

6270
[Fact]
6371
[Trait(Category.AcceptanceType, Category.CheckIn)]
6472
public void TestNegativeAdlaJob()
6573
{
66-
RunPowerShellTest(string.Format("Test-NegativeDataLakeAnalyticsJob -resourceGroupName {0} -accountName {1} -dataLakeAccountName {2} -location '{3}'", this.resourceGroupName, this.dataLakeAnalyticsAccountName, this.dataLakeStoreAccountName, AdlaTestsBase.resourceGroupLocation));
74+
RunPowerShellTest(false,
75+
string.Format(
76+
"Test-NegativeDataLakeAnalyticsJob -resourceGroupName {0} -accountName {1} -dataLakeAccountName {2} -location '{3}'",
77+
this.resourceGroupName, this.dataLakeAnalyticsAccountName, this.dataLakeStoreAccountName,
78+
AdlaTestsBase.resourceGroupLocation));
6779
}
6880
}
6981
}

‎src/ResourceManager/DataLakeAnalytics/Commands.DataLakeAnalytics.Test/ScenarioTests/AdlaTestsBase.cs

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ protected void SetupManagementClients()
9090
resourceManagementClient, dataLakeStoreManagementClient, storageManagementClient);
9191
}
9292

93-
protected void RunPowerShellTest(params string[] scripts)
93+
protected void RunPowerShellTest(bool createWasbAccount, params string[] scripts)
9494
{
9595
using (UndoContext context = UndoContext.Current)
9696
{
@@ -102,10 +102,15 @@ protected void RunPowerShellTest(params string[] scripts)
102102
this.TryCreateResourceGroup(this.resourceGroupName, resourceGroupLocation);
103103
this.TryCreateDataLakeStoreAccount(this.resourceGroupName, this.dataLakeStoreAccountName, resourceGroupLocation);
104104
this.TryCreateDataLakeStoreAccount(this.resourceGroupName, this.secondDataLakeStoreAccountName, resourceGroupLocation);
105-
string storageSuffix;
106-
this.azureBlobStoreAccessKey = this.TryCreateStorageAccount(this.resourceGroupName, this.azureBlobStoreName,
107-
"DataLakeAnalyticsTestStorage", "DataLakeAnalyticsTestStorageDescription", resourceGroupLocation,
108-
out storageSuffix);
105+
if (createWasbAccount)
106+
{
107+
string storageSuffix;
108+
this.azureBlobStoreAccessKey = this.TryCreateStorageAccount(this.resourceGroupName,
109+
this.azureBlobStoreName,
110+
"DataLakeAnalyticsTestStorage", "DataLakeAnalyticsTestStorageDescription", resourceGroupLocation,
111+
out storageSuffix);
112+
}
113+
109114
helper.SetupEnvironment(AzureModule.AzureResourceManager);
110115
helper.SetupModules(AzureModule.AzureResourceManager, "ScenarioTests\\" + this.GetType().Name + ".ps1",
111116
helper.RMProfileModule, helper.GetRMModulePath(@"AzureRM.DataLakeAnalytics.psd1"));

0 commit comments

Comments
 (0)