Skip to content

RDTask 7257781:[CRI][Github][PSH][Issue] Enable xunit test automation… #2968

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 3 commits into from
Sep 22, 2016
Merged

RDTask 7257781:[CRI][Github][PSH][Issue] Enable xunit test automation… #2968

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4e9ad75
RDTask 7257781:[CRI][Github][PSH][Issue] Enable xunit test automation…
blueww Sep 20, 2016
f2e62d6
Merge branch 'dev' of https://github.com/Azure/azure-powershell into dev
blueww Sep 21, 2016
608a7a9
Merge branch 'dev' of https://github.com/Azure/azure-powershell into dev
blueww Sep 22, 2016
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
18 changes: 14 additions & 4 deletions ...eManager/Storage/Commands.Management.Storage.Test/Commands.Management.Storage.Test.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,9 +50,10 @@
<Reference Include="Microsoft.Azure.Management.Authorization">
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Authorization.2.0.0\lib\net40\Microsoft.Azure.Management.Authorization.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Azure.Management.Storage, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<Reference Include="Microsoft.Azure.Management.Storage, Version=5.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Storage.5.0.0-preview\lib\net45\Microsoft.Azure.Management.Storage.dll</HintPath>
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Storage.3.0.0\lib\net40\Microsoft.Azure.Management.Storage.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.Azure.ResourceManager, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
Expand All @@ -76,13 +77,18 @@
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.Rest.ClientRuntime.Azure, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\Microsoft.Rest.ClientRuntime.Azure.3.1.0\lib\net45\Microsoft.Rest.ClientRuntime.Azure.dll</HintPath>
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\packages\Microsoft.Rest.ClientRuntime.Azure.3.3.2\lib\net45\Microsoft.Rest.ClientRuntime.Azure.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.Rest.ClientRuntime.Azure.Authentication, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\Microsoft.Rest.ClientRuntime.Azure.Authentication.2.2.8-preview\lib\net45\Microsoft.Rest.ClientRuntime.Azure.Authentication.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.Rest.ClientRuntime.Azure.TestFramework, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\Microsoft.Rest.ClientRuntime.Azure.TestFramework.1.3.6-preview\lib\net45\Microsoft.Rest.ClientRuntime.Azure.TestFramework.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.Threading.Tasks">
<HintPath>..\..\..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.dll</HintPath>
</Reference>
Expand Down Expand Up @@ -149,6 +155,10 @@
<None Include="ScenarioTests\Common.ps1">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="..\..\Common\Commands.ScenarioTests.ResourceManager.Common\AzureRM.Resources.ps1">
<Link>ScenarioTests\AzureRM.Resources.ps1</Link>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="ScenarioTests\StorageAccountTests.ps1">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
Expand Down Expand Up @@ -187,4 +197,4 @@
<Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project>
</Project>
84 changes: 42 additions & 42 deletions ...rceManager/Storage/Commands.Management.Storage.Test/ScenarioTests/StorageAccountTests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ function Test-StorageAccount
# Test
$stoname = 'sto' + $rgname;
$stotype = 'Standard_GRS';
$loc = 'West US';
$loc = 'westus';

New-AzureRmResourceGroup -Name $rgname -Location $loc;

Expand All @@ -36,7 +36,7 @@ function Test-StorageAccount
$stotype = 'StandardGRS';
Retry-IfException { $global:sto = Get-AzureRmStorageAccount -ResourceGroupName $rgname -Name $stoname; }
Assert-AreEqual $sto.StorageAccountName $stoname;
Assert-AreEqual $sto.AccountType $stotype;
Assert-AreEqual $sto.Sku.Name $stotype;
Assert-AreEqual $sto.Location $loc;

$stotype = 'Standard_LRS';
Expand All @@ -45,7 +45,7 @@ function Test-StorageAccount
$sto = Get-AzureRmStorageAccount -ResourceGroupName $rgname -Name $stoname;
$stotype = 'StandardLRS';
Assert-AreEqual $sto.StorageAccountName $stoname;
Assert-AreEqual $sto.AccountType $stotype;
Assert-AreEqual $sto.Sku.Name $stotype;
Assert-AreEqual $sto.Location $loc;

$stotype = 'Standard_RAGRS';
Expand All @@ -54,7 +54,7 @@ function Test-StorageAccount
$sto = Get-AzureRmStorageAccount -ResourceGroupName $rgname -Name $stoname;
$stotype = 'StandardRAGRS';
Assert-AreEqual $sto.StorageAccountName $stoname;
Assert-AreEqual $sto.AccountType $stotype;
Assert-AreEqual $sto.Sku.Name $stotype;
Assert-AreEqual $sto.Location $loc;

$stotype = 'Standard_GRS';
Expand All @@ -63,25 +63,25 @@ function Test-StorageAccount
$sto = Get-AzureRmStorageAccount -ResourceGroupName $rgname -Name $stoname;
$stotype = 'StandardGRS';
Assert-AreEqual $sto.StorageAccountName $stoname;
Assert-AreEqual $sto.AccountType $stotype;
Assert-AreEqual $sto.Sku.Name $stotype;
Assert-AreEqual $sto.Location $loc;

$stokey1 = Get-AzureRmStorageAccountKey -ResourceGroupName $rgname -Name $stoname;

New-AzureRmStorageAccountKey -ResourceGroupName $rgname -Name $stoname -KeyName key1;

$stokey2 = Get-AzureRmStorageAccountKey -ResourceGroupName $rgname -Name $stoname;
Assert-AreNotEqual $stokey1.Key1 $stokey2.Key1;
Assert-AreEqual $stokey1.Key2 $stokey2.Key2;
Assert-AreNotEqual $stokey1[0].Value $stokey2[0].Value;
Assert-AreEqual $stokey1[1].Value $stokey2[1].Value;

New-AzureRmStorageAccountKey -ResourceGroupName $rgname -Name $stoname -KeyName key2;

$stokey3 = Get-AzureRmStorageAccountKey -ResourceGroupName $rgname -Name $stoname;
Assert-AreNotEqual $stokey1.Key1 $stokey2.Key1;
Assert-AreEqual $stokey2.Key1 $stokey3.Key1;
Assert-AreNotEqual $stokey2.Key2 $stokey3.Key2;
Assert-AreNotEqual $stokey1[0].Value $stokey2[0].Value;
Assert-AreEqual $stokey2[0].Value $stokey3[0].Value;
Assert-AreNotEqual $stokey2[1].Value $stokey3[1].Value;

Remove-AzureRmStorageAccount -ResourceGroupName $rgname -Name $stoname;
Remove-AzureRmStorageAccount -Force -ResourceGroupName $rgname -Name $stoname;
}
finally
{
Expand All @@ -104,13 +104,13 @@ function Test-NewAzureStorageAccount
# Test
$stoname = 'sto' + $rgname;
$stotype = 'Standard_GRS';
$loc = 'West US';
$loc = 'westus';

New-AzureRmResourceGroup -Name $rgname -Location $loc;

New-AzureRmStorageAccount -ResourceGroupName $rgname -Name $stoname -Location $loc -Type $stotype;

Retry-IfException { Remove-AzureRmStorageAccount -ResourceGroupName $rgname -Name $stoname; }
Retry-IfException { Remove-AzureRmStorageAccount -Force -ResourceGroupName $rgname -Name $stoname; }
}
finally
{
Expand All @@ -133,7 +133,7 @@ function Test-GetAzureStorageAccount
# Test
$stoname = 'sto' + $rgname;
$stotype = 'Standard_GRS';
$loc = 'West US';
$loc = 'westus';

New-AzureRmResourceGroup -Name $rgname -Location $loc;

Expand All @@ -142,15 +142,15 @@ function Test-GetAzureStorageAccount
Retry-IfException { $global:sto = Get-AzureRmStorageAccount -ResourceGroupName $rgname -Name $stoname; }
$stotype = 'StandardGRS';
Assert-AreEqual $sto.StorageAccountName $stoname;
Assert-AreEqual $sto.AccountType $stotype;
Assert-AreEqual $sto.Sku.Name $stotype;
Assert-AreEqual $sto.Location $loc;

$stos = Get-AzureRmStorageAccount -ResourceGroupName $rgname;
Assert-AreEqual $stos[0].StorageAccountName $stoname;
Assert-AreEqual $stos[0].AccountType $stotype;
Assert-AreEqual $stos[0].Sku.Name $stotype;
Assert-AreEqual $stos[0].Location $loc;

Remove-AzureRmStorageAccount -ResourceGroupName $rgname -Name $stoname;
Remove-AzureRmStorageAccount -Force -ResourceGroupName $rgname -Name $stoname;
}
finally
{
Expand All @@ -173,20 +173,20 @@ function Test-SetAzureStorageAccount
# Test
$stoname = 'sto' + $rgname;
$stotype = 'Standard_GRS';
$loc = 'West US';
$loc = 'westus';

New-AzureRmResourceGroup -Name $rgname -Location $loc;
New-AzureRmStorageAccount -ResourceGroupName $rgname -Name $stoname -Location $loc -Type $stotype;

Retry-IfException { $global:sto = Get-AzureRmStorageAccount -ResourceGroupName $rgname -Name $stoname; }
$stotype = 'StandardGRS';
Assert-AreEqual $sto.StorageAccountName $stoname;
Assert-AreEqual $sto.AccountType $stotype;
Assert-AreEqual $sto.Sku.Name $stotype;
Assert-AreEqual $sto.Location $loc;

$stos = Get-AzureRmStorageAccount -ResourceGroupName $rgname;
Assert-AreEqual $stos[0].StorageAccountName $stoname;
Assert-AreEqual $stos[0].AccountType $stotype;
Assert-AreEqual $stos[0].Sku.Name $stotype;
Assert-AreEqual $stos[0].Location $loc;

$stotype = 'Standard_LRS';
Expand All @@ -198,10 +198,10 @@ function Test-SetAzureStorageAccount
$sto = Get-AzureRmStorageAccount -ResourceGroupName $rgname -Name $stoname;
$stotype = 'StandardRAGRS';
Assert-AreEqual $sto.StorageAccountName $stoname;
Assert-AreEqual $sto.AccountType $stotype;
Assert-AreEqual $sto.Sku.Name $stotype;
Assert-AreEqual $sto.Location $loc;

Remove-AzureRmStorageAccount -ResourceGroupName $rgname -Name $stoname;
Remove-AzureRmStorageAccount -Force -ResourceGroupName $rgname -Name $stoname;
}
finally
{
Expand All @@ -212,7 +212,7 @@ function Test-SetAzureStorageAccount

<#
.SYNOPSIS
Test Remove-AzureRmStorageAccount
Test Remove-AzureRmStorageAccount -Force
#>
function Test-RemoveAzureStorageAccount
{
Expand All @@ -224,13 +224,13 @@ function Test-RemoveAzureStorageAccount
# Test
$stoname = 'sto' + $rgname;
$stotype = 'Standard_GRS';
$loc = 'West US';
$loc = 'westus';

New-AzureRmResourceGroup -Name $rgname -Location $loc;

New-AzureRmStorageAccount -ResourceGroupName $rgname -Name $stoname -Location $loc -Type $stotype;

Retry-IfException { Remove-AzureRmStorageAccount -ResourceGroupName $rgname -Name $stoname; }
Retry-IfException { Remove-AzureRmStorageAccount -Force -ResourceGroupName $rgname -Name $stoname; }
}
finally
{
Expand All @@ -253,16 +253,16 @@ function Test-GetAzureStorageAccountKey
# Test
$stoname = 'sto' + $rgname;
$stotype = 'Standard_GRS';
$loc = 'West US';
$loc = 'westus';

New-AzureRmResourceGroup -Name $rgname -Location $loc;

New-AzureRmStorageAccount -ResourceGroupName $rgname -Name $stoname -Location $loc -Type $stotype;

Retry-IfException { $global:stokeys = Get-AzureRmStorageAccountKey -ResourceGroupName $rgname -Name $stoname; }
Assert-AreNotEqual $stokeys.Key1 $stokeys.Key2;
Assert-AreNotEqual $stokeys[0].Value $stokeys[1].Value;

Remove-AzureRmStorageAccount -ResourceGroupName $rgname -Name $stoname;
Remove-AzureRmStorageAccount -Force -ResourceGroupName $rgname -Name $stoname;
}
finally
{
Expand All @@ -285,7 +285,7 @@ function Test-NewAzureStorageAccountKey
# Test
$stoname = 'sto' + $rgname;
$stotype = 'Standard_GRS';
$loc = 'West US';
$loc = 'westus';

New-AzureRmResourceGroup -Name $rgname -Location $loc;

Expand All @@ -296,17 +296,17 @@ function Test-NewAzureStorageAccountKey
New-AzureRmStorageAccountKey -ResourceGroupName $rgname -Name $stoname -KeyName key1;

$stokey2 = Get-AzureRmStorageAccountKey -ResourceGroupName $rgname -Name $stoname;
Assert-AreNotEqual $stokey1.Key1 $stokey2.Key1;
Assert-AreEqual $stokey1.Key2 $stokey2.Key2;
Assert-AreNotEqual $stokey1[0].Value $stokey2[0].Value;
Assert-AreEqual $stokey1[1].Value $stokey2[1].Value;

New-AzureRmStorageAccountKey -ResourceGroupName $rgname -Name $stoname -KeyName key2;

$stokey3 = Get-AzureRmStorageAccountKey -ResourceGroupName $rgname -Name $stoname;
Assert-AreNotEqual $stokey1.Key1 $stokey2.Key1;
Assert-AreEqual $stokey2.Key1 $stokey3.Key1;
Assert-AreNotEqual $stokey2.Key2 $stokey3.Key2;
Assert-AreNotEqual $stokey1[0].Value $stokey2[0].Value;
Assert-AreEqual $stokey2[0].Value $stokey3[0].Value;
Assert-AreNotEqual $stokey2[1].Value $stokey3[1].Value;

Remove-AzureRmStorageAccount -ResourceGroupName $rgname -Name $stoname;
Remove-AzureRmStorageAccount -Force -ResourceGroupName $rgname -Name $stoname;
}
finally
{
Expand All @@ -329,16 +329,16 @@ function Test-PipingGetAccountToGetKey
# Test
$stoname = 'sto' + $rgname;
$stotype = 'Standard_GRS';
$loc = 'West US';
$loc = 'westus';

New-AzureRmResourceGroup -Name $rgname -Location $loc;

New-AzureRmStorageAccount -ResourceGroupName $rgname -Name $stoname -Location $loc -Type $stotype;

Retry-IfException { $global:stokeys = Get-AzureRmStorageAccount -ResourceGroupName $rgname -Name $stoname | Get-AzureRmStorageAccountKey -ResourceGroupName $rgname; }
Assert-AreNotEqual $stokeys.Key1 $stokeys.Key2;
Assert-AreNotEqual $stokeys[0].Value $stokeys[1].Value;

Remove-AzureRmStorageAccount -ResourceGroupName $rgname -Name $stoname;
Remove-AzureRmStorageAccount -Force -ResourceGroupName $rgname -Name $stoname;
}
finally
{
Expand All @@ -361,15 +361,15 @@ function Test-PipingToSetAzureRmCurrentStorageAccount
# Test
$stoname = 'sto' + $rgname
$stotype = 'Standard_GRS'
$loc = 'West US'
$loc = 'westus'

New-AzureRmResourceGroup -Name $rgname -Location $loc
New-AzureRmStorageAccount -ResourceGroupName $rgname -Name $stoname -Location $loc -Type $stotype
Retry-IfException { $global:sto = Get-AzureRmStorageAccount -ResourceGroupName $rgname -Name $stoname }
$global:sto | Set-AzureRmCurrentStorageAccount
$context = Get-AzureRmContext
Assert-AreEqual $stoname $context.Subscription.CurrentStorageAccountName
$global:sto | Remove-AzureRmStorageAccount
$global:sto | Remove-AzureRmStorageAccount -Force
}
finally
{
Expand All @@ -392,15 +392,15 @@ function Test-SetAzureRmCurrentStorageAccount
# Test
$stoname = 'sto' + $rgname
$stotype = 'Standard_GRS'
$loc = 'West US'
$loc = 'westus'

New-AzureRmResourceGroup -Name $rgname -Location $loc
New-AzureRmStorageAccount -ResourceGroupName $rgname -Name $stoname -Location $loc -Type $stotype
Retry-IfException { $global:sto = Get-AzureRmStorageAccount -ResourceGroupName $rgname -Name $stoname }
Set-AzureRmCurrentStorageAccount -ResourceGroupName $rgname -StorageAccountName $stoname
$context = Get-AzureRmContext
Assert-AreEqual $stoname $context.Subscription.CurrentStorageAccountName
$global:sto | Remove-AzureRmStorageAccount
$global:sto | Remove-AzureRmStorageAccount -Force
}
finally
{
Expand Down
Loading