Skip to content

Add help XML and update job package #1488

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Dec 17, 2015
Merged

Add help XML and update job package #1488

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
bbd6a3c
Update version of the job package and re-run tests
Dec 11, 2015
8a9e512
Merge branch 'dev' of https://github.com/Azure/azure-powershell into dev
Dec 15, 2015
e23401a
Adding help xml for ADL
Dec 15, 2015
9b8e4bd
Remove local feed, fix display for jobs include ID
Dec 15, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .../DataLakeAnalytics/Commands.DataLakeAnalytics.Test/Commands.DataLakeAnalytics.Test.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@
</Reference>
<Reference Include="Microsoft.Azure.Management.DataLake.AnalyticsJob, Version=0.9.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\packages\Microsoft.Azure.Management.DataLake.AnalyticsJob.0.9.5-preview\lib\net40\Microsoft.Azure.Management.DataLake.AnalyticsJob.dll</HintPath>
<HintPath>..\..\..\packages\Microsoft.Azure.Management.DataLake.AnalyticsJob.0.9.6-preview\lib\net40\Microsoft.Azure.Management.DataLake.AnalyticsJob.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Azure.Management.DataLake.Store, Version=0.9.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
Expand Down
22 changes: 17 additions & 5 deletions ...ourceManager/DataLakeAnalytics/Commands.DataLakeAnalytics.Test/ScenarioTests/AdlaTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ public class AdlaTests : AdlaTestsBase
[Trait(Category.AcceptanceType, Category.CheckIn)]
public void TestAdlaAccount()
{
RunPowerShellTest(
RunPowerShellTest(true,
string.Format(
"Test-DataLakeAnalyticsAccount -resourceGroupName {0} -accountName {1} -dataLakeAccountName {2} -secondDataLakeAccountName {3} -blobAccountName {4} -blobAccountKey {5} -location '{6}'",
this.resourceGroupName, this.dataLakeAnalyticsAccountName, this.dataLakeStoreAccountName,
Expand All @@ -36,7 +36,7 @@ public void TestAdlaAccount()
[Trait(Category.AcceptanceType, Category.CheckIn)]
public void TestAdlaCatalog()
{
RunPowerShellTest(
RunPowerShellTest(false,
string.Format(
"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}'",
this.resourceGroupName, this.dataLakeAnalyticsAccountName, this.dataLakeStoreAccountName,
Expand All @@ -49,21 +49,33 @@ public void TestAdlaCatalog()
[Trait(Category.AcceptanceType, Category.CheckIn)]
public void TestAdlaJob()
{
RunPowerShellTest(string.Format("Test-DataLakeAnalyticsJob -resourceGroupName {0} -accountName {1} -dataLakeAccountName {2} -location '{3}'", this.resourceGroupName, this.dataLakeAnalyticsAccountName, this.dataLakeStoreAccountName, AdlaTestsBase.resourceGroupLocation));
RunPowerShellTest(false,
string.Format(
"Test-DataLakeAnalyticsJob -resourceGroupName {0} -accountName {1} -dataLakeAccountName {2} -location '{3}'",
this.resourceGroupName, this.dataLakeAnalyticsAccountName, this.dataLakeStoreAccountName,
AdlaTestsBase.resourceGroupLocation));
}

[Fact]
[Trait(Category.AcceptanceType, Category.CheckIn)]
public void TestNegativeAdlaAccount()
{
RunPowerShellTest(string.Format("Test-NegativeDataLakeAnalyticsAccount -resourceGroupName {0} -accountName {1} -dataLakeAccountName {2} -location '{3}'", this.resourceGroupName, this.dataLakeAnalyticsAccountName, this.dataLakeStoreAccountName, AdlaTestsBase.resourceGroupLocation));
RunPowerShellTest(false,
string.Format(
"Test-NegativeDataLakeAnalyticsAccount -resourceGroupName {0} -accountName {1} -dataLakeAccountName {2} -location '{3}'",
this.resourceGroupName, this.dataLakeAnalyticsAccountName, this.dataLakeStoreAccountName,
AdlaTestsBase.resourceGroupLocation));
}

[Fact]
[Trait(Category.AcceptanceType, Category.CheckIn)]
public void TestNegativeAdlaJob()
{
RunPowerShellTest(string.Format("Test-NegativeDataLakeAnalyticsJob -resourceGroupName {0} -accountName {1} -dataLakeAccountName {2} -location '{3}'", this.resourceGroupName, this.dataLakeAnalyticsAccountName, this.dataLakeStoreAccountName, AdlaTestsBase.resourceGroupLocation));
RunPowerShellTest(false,
string.Format(
"Test-NegativeDataLakeAnalyticsJob -resourceGroupName {0} -accountName {1} -dataLakeAccountName {2} -location '{3}'",
this.resourceGroupName, this.dataLakeAnalyticsAccountName, this.dataLakeStoreAccountName,
AdlaTestsBase.resourceGroupLocation));
}
}
}
15 changes: 10 additions & 5 deletions ...eManager/DataLakeAnalytics/Commands.DataLakeAnalytics.Test/ScenarioTests/AdlaTestsBase.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ protected void SetupManagementClients()
resourceManagementClient, dataLakeStoreManagementClient, storageManagementClient);
}

protected void RunPowerShellTest(params string[] scripts)
protected void RunPowerShellTest(bool createWasbAccount, params string[] scripts)
{
using (UndoContext context = UndoContext.Current)
{
Expand All @@ -102,10 +102,15 @@ protected void RunPowerShellTest(params string[] scripts)
this.TryCreateResourceGroup(this.resourceGroupName, resourceGroupLocation);
this.TryCreateDataLakeStoreAccount(this.resourceGroupName, this.dataLakeStoreAccountName, resourceGroupLocation);
this.TryCreateDataLakeStoreAccount(this.resourceGroupName, this.secondDataLakeStoreAccountName, resourceGroupLocation);
string storageSuffix;
this.azureBlobStoreAccessKey = this.TryCreateStorageAccount(this.resourceGroupName, this.azureBlobStoreName,
"DataLakeAnalyticsTestStorage", "DataLakeAnalyticsTestStorageDescription", resourceGroupLocation,
out storageSuffix);
if (createWasbAccount)
{
string storageSuffix;
this.azureBlobStoreAccessKey = this.TryCreateStorageAccount(this.resourceGroupName,
this.azureBlobStoreName,
"DataLakeAnalyticsTestStorage", "DataLakeAnalyticsTestStorageDescription", resourceGroupLocation,
out storageSuffix);
}

helper.SetupEnvironment(AzureModule.AzureResourceManager);
helper.SetupModules(AzureModule.AzureResourceManager, "ScenarioTests\\" + this.GetType().Name + ".ps1",
helper.RMProfileModule, helper.GetRMModulePath(@"AzureRM.DataLakeAnalytics.psd1"));
Expand Down
Loading