Skip to content

Commit 3a7a8da

Browse files
committed
Resolve SRP cmdlets unit test failures.
1 parent f44e824 commit 3a7a8da

File tree

9 files changed

+1727
-1712
lines changed

9 files changed

+1727
-1712
lines changed

src/ResourceManager/Compute/Commands.Compute.Test/ScenarioTests/StorageAccountTests.ps1

Lines changed: 16 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -33,33 +33,37 @@ function Test-StorageAccount
3333
New-AzureStorageAccount -ResourceGroupName $rgname -Name $stoname -Location $loc -Type $stotype;
3434
$stos = Get-AzureStorageAccount -ResourceGroupName $rgname;
3535

36+
$stotype = 'StandardGRS';
3637
Retry-IfException { $global:sto = Get-AzureStorageAccount -ResourceGroupName $rgname -Name $stoname; }
3738
Assert-AreEqual $sto.Name $stoname;
38-
Assert-AreEqual $sto.Properties.AccountType $stotype;
39+
Assert-AreEqual $sto.AccountType $stotype;
3940
Assert-AreEqual $sto.Location $loc;
4041

4142
$stotype = 'Standard_LRS';
4243
# TODO: Still need to do retry for Set-, even after Get- returns it.
4344
Retry-IfException { $global:sto = Set-AzureStorageAccount -ResourceGroupName $rgname -Name $stoname -Type $stotype; }
4445
$sto = Get-AzureStorageAccount -ResourceGroupName $rgname -Name $stoname;
46+
$stotype = 'StandardLRS';
4547
Assert-AreEqual $sto.Name $stoname;
46-
Assert-AreEqual $sto.Properties.AccountType $stotype;
48+
Assert-AreEqual $sto.AccountType $stotype;
4749
Assert-AreEqual $sto.Location $loc;
4850

4951
$stotype = 'Standard_RAGRS';
5052
Set-AzureStorageAccount -ResourceGroupName $rgname -Name $stoname -Type $stotype;
5153

5254
$sto = Get-AzureStorageAccount -ResourceGroupName $rgname -Name $stoname;
55+
$stotype = 'StandardRAGRS';
5356
Assert-AreEqual $sto.Name $stoname;
54-
Assert-AreEqual $sto.Properties.AccountType $stotype;
57+
Assert-AreEqual $sto.AccountType $stotype;
5558
Assert-AreEqual $sto.Location $loc;
5659

5760
$stotype = 'Standard_GRS';
5861
Set-AzureStorageAccount -ResourceGroupName $rgname -Name $stoname -Type $stotype;
5962

6063
$sto = Get-AzureStorageAccount -ResourceGroupName $rgname -Name $stoname;
64+
$stotype = 'StandardGRS';
6165
Assert-AreEqual $sto.Name $stoname;
62-
Assert-AreEqual $sto.Properties.AccountType $stotype;
66+
Assert-AreEqual $sto.AccountType $stotype;
6367
Assert-AreEqual $sto.Location $loc;
6468

6569
$stokey1 = Get-AzureStorageAccountKey -ResourceGroupName $rgname -Name $stoname;
@@ -136,13 +140,14 @@ function Test-GetAzureStorageAccount
136140
New-AzureStorageAccount -ResourceGroupName $rgname -Name $stoname -Location $loc -Type $stotype;
137141

138142
Retry-IfException { $global:sto = Get-AzureStorageAccount -ResourceGroupName $rgname -Name $stoname; }
143+
$stotype = 'StandardGRS';
139144
Assert-AreEqual $sto.Name $stoname;
140-
Assert-AreEqual $sto.Properties.AccountType $stotype;
145+
Assert-AreEqual $sto.AccountType $stotype;
141146
Assert-AreEqual $sto.Location $loc;
142147

143148
$stos = Get-AzureStorageAccount -ResourceGroupName $rgname;
144149
Assert-AreEqual $stos[0].Name $stoname;
145-
Assert-AreEqual $stos[0].Properties.AccountType $stotype;
150+
Assert-AreEqual $stos[0].AccountType $stotype;
146151
Assert-AreEqual $stos[0].Location $loc;
147152

148153
Remove-AzureStorageAccount -ResourceGroupName $rgname -Name $stoname;
@@ -174,13 +179,14 @@ function Test-SetAzureStorageAccount
174179
New-AzureStorageAccount -ResourceGroupName $rgname -Name $stoname -Location $loc -Type $stotype;
175180

176181
Retry-IfException { $global:sto = Get-AzureStorageAccount -ResourceGroupName $rgname -Name $stoname; }
182+
$stotype = 'StandardGRS';
177183
Assert-AreEqual $sto.Name $stoname;
178-
Assert-AreEqual $sto.Properties.AccountType $stotype;
184+
Assert-AreEqual $sto.AccountType $stotype;
179185
Assert-AreEqual $sto.Location $loc;
180186

181187
$stos = Get-AzureStorageAccount -ResourceGroupName $rgname;
182188
Assert-AreEqual $stos[0].Name $stoname;
183-
Assert-AreEqual $stos[0].Properties.AccountType $stotype;
189+
Assert-AreEqual $stos[0].AccountType $stotype;
184190
Assert-AreEqual $stos[0].Location $loc;
185191

186192
$stotype = 'Standard_LRS';
@@ -190,8 +196,9 @@ function Test-SetAzureStorageAccount
190196
Set-AzureStorageAccount -ResourceGroupName $rgname -Name $stoname -Type $stotype;
191197

192198
$sto = Get-AzureStorageAccount -ResourceGroupName $rgname -Name $stoname;
199+
$stotype = 'StandardRAGRS';
193200
Assert-AreEqual $sto.Name $stoname;
194-
Assert-AreEqual $sto.Properties.AccountType $stotype;
201+
Assert-AreEqual $sto.AccountType $stotype;
195202
Assert-AreEqual $sto.Location $loc;
196203

197204
Remove-AzureStorageAccount -ResourceGroupName $rgname -Name $stoname;

0 commit comments

Comments
 (0)