Skip to content

Commit ac9d94d

Browse files
markcowlmarkcowl
authored
Merge pull request #2968 from wastoresh/dev
RDTask 7257781:[CRI][Github][PSH][Issue] Enable xunit test automation…
2 parents c4c0705 + 608a7a9 commit ac9d94d

14 files changed

+2185
-4934
lines changed

‎src/ResourceManager/Storage/Commands.Management.Storage.Test/Commands.Management.Storage.Test.csproj

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,10 @@
5050
<Reference Include="Microsoft.Azure.Management.Authorization">
5151
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Authorization.2.0.0\lib\net40\Microsoft.Azure.Management.Authorization.dll</HintPath>
5252
</Reference>
53-
<Reference Include="Microsoft.Azure.Management.Storage, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
53+
<Reference Include="Microsoft.Azure.Management.Storage, Version=5.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
54+
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Storage.5.0.0-preview\lib\net45\Microsoft.Azure.Management.Storage.dll</HintPath>
5455
<SpecificVersion>False</SpecificVersion>
55-
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Storage.3.0.0\lib\net40\Microsoft.Azure.Management.Storage.dll</HintPath>
56+
<Private>True</Private>
5657
</Reference>
5758
<Reference Include="Microsoft.Azure.ResourceManager, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
5859
<SpecificVersion>False</SpecificVersion>
@@ -76,13 +77,18 @@
7677
<Private>True</Private>
7778
</Reference>
7879
<Reference Include="Microsoft.Rest.ClientRuntime.Azure, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
80+
<HintPath>..\..\..\packages\Microsoft.Rest.ClientRuntime.Azure.3.1.0\lib\net45\Microsoft.Rest.ClientRuntime.Azure.dll</HintPath>
7981
<SpecificVersion>False</SpecificVersion>
80-
<HintPath>..\..\..\packages\Microsoft.Rest.ClientRuntime.Azure.3.3.2\lib\net45\Microsoft.Rest.ClientRuntime.Azure.dll</HintPath>
82+
<Private>True</Private>
8183
</Reference>
8284
<Reference Include="Microsoft.Rest.ClientRuntime.Azure.Authentication, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
8385
<HintPath>..\..\..\packages\Microsoft.Rest.ClientRuntime.Azure.Authentication.2.2.8-preview\lib\net45\Microsoft.Rest.ClientRuntime.Azure.Authentication.dll</HintPath>
8486
<Private>True</Private>
8587
</Reference>
88+
<Reference Include="Microsoft.Rest.ClientRuntime.Azure.TestFramework, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
89+
<HintPath>..\..\..\packages\Microsoft.Rest.ClientRuntime.Azure.TestFramework.1.3.6-preview\lib\net45\Microsoft.Rest.ClientRuntime.Azure.TestFramework.dll</HintPath>
90+
<Private>True</Private>
91+
</Reference>
8692
<Reference Include="Microsoft.Threading.Tasks">
8793
<HintPath>..\..\..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.dll</HintPath>
8894
</Reference>
@@ -149,6 +155,10 @@
149155
<None Include="ScenarioTests\Common.ps1">
150156
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
151157
</None>
158+
<None Include="..\..\Common\Commands.ScenarioTests.ResourceManager.Common\AzureRM.Resources.ps1">
159+
<Link>ScenarioTests\AzureRM.Resources.ps1</Link>
160+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
161+
</None>
152162
<None Include="ScenarioTests\StorageAccountTests.ps1">
153163
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
154164
</None>
@@ -187,4 +197,4 @@
187197
<Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
188198
</ItemGroup>
189199
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
190-
</Project>
200+
</Project>

‎src/ResourceManager/Storage/Commands.Management.Storage.Test/ScenarioTests/StorageAccountTests.ps1

Lines changed: 42 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ function Test-StorageAccount
2626
# Test
2727
$stoname = 'sto' + $rgname;
2828
$stotype = 'Standard_GRS';
29-
$loc = 'West US';
29+
$loc = 'westus';
3030

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

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

4242
$stotype = 'Standard_LRS';
@@ -45,7 +45,7 @@ function Test-StorageAccount
4545
$sto = Get-AzureRmStorageAccount -ResourceGroupName $rgname -Name $stoname;
4646
$stotype = 'StandardLRS';
4747
Assert-AreEqual $sto.StorageAccountName $stoname;
48-
Assert-AreEqual $sto.AccountType $stotype;
48+
Assert-AreEqual $sto.Sku.Name $stotype;
4949
Assert-AreEqual $sto.Location $loc;
5050

5151
$stotype = 'Standard_RAGRS';
@@ -54,7 +54,7 @@ function Test-StorageAccount
5454
$sto = Get-AzureRmStorageAccount -ResourceGroupName $rgname -Name $stoname;
5555
$stotype = 'StandardRAGRS';
5656
Assert-AreEqual $sto.StorageAccountName $stoname;
57-
Assert-AreEqual $sto.AccountType $stotype;
57+
Assert-AreEqual $sto.Sku.Name $stotype;
5858
Assert-AreEqual $sto.Location $loc;
5959

6060
$stotype = 'Standard_GRS';
@@ -63,25 +63,25 @@ function Test-StorageAccount
6363
$sto = Get-AzureRmStorageAccount -ResourceGroupName $rgname -Name $stoname;
6464
$stotype = 'StandardGRS';
6565
Assert-AreEqual $sto.StorageAccountName $stoname;
66-
Assert-AreEqual $sto.AccountType $stotype;
66+
Assert-AreEqual $sto.Sku.Name $stotype;
6767
Assert-AreEqual $sto.Location $loc;
6868

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

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

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

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

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

84-
Remove-AzureRmStorageAccount -ResourceGroupName $rgname -Name $stoname;
84+
Remove-AzureRmStorageAccount -Force -ResourceGroupName $rgname -Name $stoname;
8585
}
8686
finally
8787
{
@@ -104,13 +104,13 @@ function Test-NewAzureStorageAccount
104104
# Test
105105
$stoname = 'sto' + $rgname;
106106
$stotype = 'Standard_GRS';
107-
$loc = 'West US';
107+
$loc = 'westus';
108108

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

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

113-
Retry-IfException { Remove-AzureRmStorageAccount -ResourceGroupName $rgname -Name $stoname; }
113+
Retry-IfException { Remove-AzureRmStorageAccount -Force -ResourceGroupName $rgname -Name $stoname; }
114114
}
115115
finally
116116
{
@@ -133,7 +133,7 @@ function Test-GetAzureStorageAccount
133133
# Test
134134
$stoname = 'sto' + $rgname;
135135
$stotype = 'Standard_GRS';
136-
$loc = 'West US';
136+
$loc = 'westus';
137137

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

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

148148
$stos = Get-AzureRmStorageAccount -ResourceGroupName $rgname;
149149
Assert-AreEqual $stos[0].StorageAccountName $stoname;
150-
Assert-AreEqual $stos[0].AccountType $stotype;
150+
Assert-AreEqual $stos[0].Sku.Name $stotype;
151151
Assert-AreEqual $stos[0].Location $loc;
152152

153-
Remove-AzureRmStorageAccount -ResourceGroupName $rgname -Name $stoname;
153+
Remove-AzureRmStorageAccount -Force -ResourceGroupName $rgname -Name $stoname;
154154
}
155155
finally
156156
{
@@ -173,20 +173,20 @@ function Test-SetAzureStorageAccount
173173
# Test
174174
$stoname = 'sto' + $rgname;
175175
$stotype = 'Standard_GRS';
176-
$loc = 'West US';
176+
$loc = 'westus';
177177

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

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

187187
$stos = Get-AzureRmStorageAccount -ResourceGroupName $rgname;
188188
Assert-AreEqual $stos[0].StorageAccountName $stoname;
189-
Assert-AreEqual $stos[0].AccountType $stotype;
189+
Assert-AreEqual $stos[0].Sku.Name $stotype;
190190
Assert-AreEqual $stos[0].Location $loc;
191191

192192
$stotype = 'Standard_LRS';
@@ -198,10 +198,10 @@ function Test-SetAzureStorageAccount
198198
$sto = Get-AzureRmStorageAccount -ResourceGroupName $rgname -Name $stoname;
199199
$stotype = 'StandardRAGRS';
200200
Assert-AreEqual $sto.StorageAccountName $stoname;
201-
Assert-AreEqual $sto.AccountType $stotype;
201+
Assert-AreEqual $sto.Sku.Name $stotype;
202202
Assert-AreEqual $sto.Location $loc;
203203

204-
Remove-AzureRmStorageAccount -ResourceGroupName $rgname -Name $stoname;
204+
Remove-AzureRmStorageAccount -Force -ResourceGroupName $rgname -Name $stoname;
205205
}
206206
finally
207207
{
@@ -212,7 +212,7 @@ function Test-SetAzureStorageAccount
212212

213213
<#
214214
.SYNOPSIS
215-
Test Remove-AzureRmStorageAccount
215+
Test Remove-AzureRmStorageAccount -Force
216216
#>
217217
function Test-RemoveAzureStorageAccount
218218
{
@@ -224,13 +224,13 @@ function Test-RemoveAzureStorageAccount
224224
# Test
225225
$stoname = 'sto' + $rgname;
226226
$stotype = 'Standard_GRS';
227-
$loc = 'West US';
227+
$loc = 'westus';
228228

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

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

233-
Retry-IfException { Remove-AzureRmStorageAccount -ResourceGroupName $rgname -Name $stoname; }
233+
Retry-IfException { Remove-AzureRmStorageAccount -Force -ResourceGroupName $rgname -Name $stoname; }
234234
}
235235
finally
236236
{
@@ -253,16 +253,16 @@ function Test-GetAzureStorageAccountKey
253253
# Test
254254
$stoname = 'sto' + $rgname;
255255
$stotype = 'Standard_GRS';
256-
$loc = 'West US';
256+
$loc = 'westus';
257257

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

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

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

265-
Remove-AzureRmStorageAccount -ResourceGroupName $rgname -Name $stoname;
265+
Remove-AzureRmStorageAccount -Force -ResourceGroupName $rgname -Name $stoname;
266266
}
267267
finally
268268
{
@@ -285,7 +285,7 @@ function Test-NewAzureStorageAccountKey
285285
# Test
286286
$stoname = 'sto' + $rgname;
287287
$stotype = 'Standard_GRS';
288-
$loc = 'West US';
288+
$loc = 'westus';
289289

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

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

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

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

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

309-
Remove-AzureRmStorageAccount -ResourceGroupName $rgname -Name $stoname;
309+
Remove-AzureRmStorageAccount -Force -ResourceGroupName $rgname -Name $stoname;
310310
}
311311
finally
312312
{
@@ -329,16 +329,16 @@ function Test-PipingGetAccountToGetKey
329329
# Test
330330
$stoname = 'sto' + $rgname;
331331
$stotype = 'Standard_GRS';
332-
$loc = 'West US';
332+
$loc = 'westus';
333333

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

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

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

341-
Remove-AzureRmStorageAccount -ResourceGroupName $rgname -Name $stoname;
341+
Remove-AzureRmStorageAccount -Force -ResourceGroupName $rgname -Name $stoname;
342342
}
343343
finally
344344
{
@@ -361,15 +361,15 @@ function Test-PipingToSetAzureRmCurrentStorageAccount
361361
# Test
362362
$stoname = 'sto' + $rgname
363363
$stotype = 'Standard_GRS'
364-
$loc = 'West US'
364+
$loc = 'westus'
365365

366366
New-AzureRmResourceGroup -Name $rgname -Location $loc
367367
New-AzureRmStorageAccount -ResourceGroupName $rgname -Name $stoname -Location $loc -Type $stotype
368368
Retry-IfException { $global:sto = Get-AzureRmStorageAccount -ResourceGroupName $rgname -Name $stoname }
369369
$global:sto | Set-AzureRmCurrentStorageAccount
370370
$context = Get-AzureRmContext
371371
Assert-AreEqual $stoname $context.Subscription.CurrentStorageAccountName
372-
$global:sto | Remove-AzureRmStorageAccount
372+
$global:sto | Remove-AzureRmStorageAccount -Force
373373
}
374374
finally
375375
{
@@ -392,15 +392,15 @@ function Test-SetAzureRmCurrentStorageAccount
392392
# Test
393393
$stoname = 'sto' + $rgname
394394
$stotype = 'Standard_GRS'
395-
$loc = 'West US'
395+
$loc = 'westus'
396396

397397
New-AzureRmResourceGroup -Name $rgname -Location $loc
398398
New-AzureRmStorageAccount -ResourceGroupName $rgname -Name $stoname -Location $loc -Type $stotype
399399
Retry-IfException { $global:sto = Get-AzureRmStorageAccount -ResourceGroupName $rgname -Name $stoname }
400400
Set-AzureRmCurrentStorageAccount -ResourceGroupName $rgname -StorageAccountName $stoname
401401
$context = Get-AzureRmContext
402402
Assert-AreEqual $stoname $context.Subscription.CurrentStorageAccountName
403-
$global:sto | Remove-AzureRmStorageAccount
403+
$global:sto | Remove-AzureRmStorageAccount -Force
404404
}
405405
finally
406406
{

0 commit comments

Comments
 (0)