Skip to content

Commit 61c1382

Browse files
hyonholeehyonholee
committed
Add AsJob tests
1 parent 4bf0c5d commit 61c1382

File tree

12 files changed

+11480
-441236
lines changed

12 files changed

+11480
-441236
lines changed

‎src/ResourceManager/Compute/Commands.Compute.Test/ScenarioTests/AvailabilitySetTests.ps1

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,9 @@ function Test-AvailabilitySet
3131
$nonDefaultUD = 2;
3232
$nonDefaultFD = 3;
3333

34-
$job = New-AzureRmAvailabilitySet -ResourceGroupName $rgname -Name $asetName -Location $loc -PlatformUpdateDomainCount $nonDefaultUD -PlatformFaultDomainCount $nonDefaultFD -Sku 'Classic' -AsJob
35-
$job | Wait-Job
34+
$job = New-AzureRmAvailabilitySet -ResourceGroupName $rgname -Name $asetName -Location $loc -PlatformUpdateDomainCount $nonDefaultUD -PlatformFaultDomainCount $nonDefaultFD -Sku 'Classic' -AsJob;
35+
$result = $job | Wait-Job;
36+
Assert-AreEqual "Completed" $result.State;
3637

3738
$asets = Get-AzureRmAvailabilitySet -ResourceGroupName $rgname;
3839
Assert-NotNull $asets;
@@ -46,8 +47,9 @@ function Test-AvailabilitySet
4647
Assert-False {$aset.Managed};
4748
Assert-AreEqual 'Classic' $aset.Sku;
4849

49-
$job = $aset | Update-AzureRmAvailabilitySet -Managed -AsJob
50-
$job | Wait-Job
50+
$job = $aset | Update-AzureRmAvailabilitySet -Managed -AsJob;
51+
$result = $job | Wait-Job;
52+
Assert-AreEqual "Completed" $result.State;
5153
$aset = Get-AzureRmAvailabilitySet -ResourceGroupName $rgname -Name $asetName;
5254

5355
Assert-NotNull $aset;
@@ -65,8 +67,9 @@ function Test-AvailabilitySet
6567
Assert-AreEqual $nonDefaultFD $aset.PlatformFaultDomainCount;
6668
Assert-AreEqual 'Aligned' $aset.Sku;
6769

68-
$job = Remove-AzureRmAvailabilitySet -ResourceGroupName $rgname -Name $asetName -Force -AsJob
69-
$job | Wait-Job
70+
$job = Remove-AzureRmAvailabilitySet -ResourceGroupName $rgname -Name $asetName -Force -AsJob;
71+
$result = $job | Wait-Job;
72+
Assert-AreEqual "Completed" $result.State;
7073

7174
$asets = Get-AzureRmAvailabilitySet -ResourceGroupName $rgname;
7275
Assert-AreEqual $asets $null;

‎src/ResourceManager/Compute/Commands.Compute.Test/ScenarioTests/ContainerServiceTests.ps1

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,9 @@ function Test-ContainerService
6060
$job = New-AzureRmContainerServiceConfig -Location $loc -OrchestratorType $orchestratorType `
6161
-MasterDnsPrefix $masterDnsPrefixName -AdminUsername $adminUserName -SshPublicKey $sshPublicKey `
6262
| Add-AzureRmContainerServiceAgentPoolProfile -Name $agentPoolProfileName -VmSize $vmSize -DnsPrefix $agentPoolDnsPrefixName -Count 1 `
63-
| New-AzureRmContainerService -ResourceGroupName $rgname -Name $csName -AsJob
64-
$job | Wait-Job
63+
| New-AzureRmContainerService -ResourceGroupName $rgname -Name $csName -AsJob;
64+
$result = $job | Wait-Job;
65+
Assert-AreEqual "Completed" $result.State;
6566
$container = $job | Receive-Job
6667

6768
$cs = Get-AzureRmContainerService -ResourceGroupName $rgname -Name $csName;
@@ -72,8 +73,9 @@ function Test-ContainerService
7273
$output = $cslist | Out-String;
7374
Assert-False { $output.Contains("AgentPoolProfiles") };
7475

75-
$job = Remove-AzureRmContainerService -ResourceGroupName $rgname -Name $csName -Force -AsJob
76-
$job | Wait-Job
76+
$job = Remove-AzureRmContainerService -ResourceGroupName $rgname -Name $csName -Force -AsJob;
77+
$result = $job | Wait-Job;
78+
Assert-AreEqual "Completed" $result.State;
7779
$st = $job | Receive-Job
7880
}
7981
finally
@@ -147,7 +149,8 @@ function Test-ContainerServiceUpdate
147149
-DnsPrefix $agentPoolDnsPrefixName `
148150
-Count 2 `
149151
| Update-AzureRmContainerService -AsJob;
150-
$job | Wait-Job;
152+
$result = $job | Wait-Job;
153+
Assert-AreEqual "Completed" $result.State;
151154

152155
$st = Get-AzureRmContainerService -ResourceGroupName $rgname -Name $csName | Remove-AzureRmContainerService -Force;
153156
}

‎src/ResourceManager/Compute/Commands.Compute.Test/ScenarioTests/DiskRPTests.ps1

Lines changed: 26 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,9 @@ function Test-Disk
5656
Assert-AreEqual "1" $diskconfig.Zones
5757
$diskconfig.Zones = $null
5858

59-
$job = New-AzureRmDisk -ResourceGroupName $rgname -DiskName $diskname -Disk $diskconfig -AsJob
60-
$job | Wait-Job
59+
$job = New-AzureRmDisk -ResourceGroupName $rgname -DiskName $diskname -Disk $diskconfig -AsJob;
60+
$result = $job | Wait-Job;
61+
Assert-AreEqual "Completed" $result.State;
6162

6263
# Get disk test
6364
$disk = Get-AzureRmDisk -ResourceGroupName $rgname -DiskName $diskname;
@@ -70,18 +71,22 @@ function Test-Disk
7071

7172
# Grant access test
7273
$job = Grant-AzureRmDiskAccess -ResourceGroupName $rgname -DiskName $diskname -Access $access -DurationInSecond 5 -AsJob;
73-
$job | Wait-Job;
74+
$result = $job | Wait-Job;
75+
Assert-AreEqual "Completed" $result.State;
7476
$job = Revoke-AzureRmDiskAccess -ResourceGroupName $rgname -DiskName $diskname -AsJob;
75-
$job | Wait-Job;
77+
$result = $job | Wait-Job;
78+
Assert-AreEqual "Completed" $result.State;
7679

7780
# Config update test
7881
$updateconfig = New-AzureRmDiskUpdateConfig -DiskSizeGB 10 -AccountType PremiumLRS -OsType Windows;
79-
$job = Update-AzureRmDisk -ResourceGroupName $rgname -DiskName $diskname -DiskUpdate $updateconfig -AsJob
80-
$job | Wait-Job
82+
$job = Update-AzureRmDisk -ResourceGroupName $rgname -DiskName $diskname -DiskUpdate $updateconfig -AsJob;
83+
$result = $job | Wait-Job;
84+
Assert-AreEqual "Completed" $result.State;
8185

8286
# Remove test
83-
$job = Remove-AzureRmDisk -ResourceGroupName $rgname -DiskName $diskname -Force -AsJob
84-
$job | Wait-Job
87+
$job = Remove-AzureRmDisk -ResourceGroupName $rgname -DiskName $diskname -Force -AsJob;
88+
$result = $job | Wait-Job;
89+
Assert-AreEqual "Completed" $result.State;
8590
}
8691
finally
8792
{
@@ -127,8 +132,9 @@ function Test-Snapshot
127132
$snapshotconfig.EncryptionSettings.DiskEncryptionKey = $null;
128133
$snapshotconfig.EncryptionSettings.KeyEncryptionKey = $null;
129134
$snapshotconfig.CreationData.ImageReference = $null;
130-
$job = New-AzureRmSnapshot -ResourceGroupName $rgname -SnapshotName $snapshotname -Snapshot $snapshotconfig -AsJob
131-
$job | Wait-Job
135+
$job = New-AzureRmSnapshot -ResourceGroupName $rgname -SnapshotName $snapshotname -Snapshot $snapshotconfig -AsJob;
136+
$result = $job | Wait-Job;
137+
Assert-AreEqual "Completed" $result.State;
132138

133139
# Get snapshot test
134140
$snapshot = Get-AzureRmSnapshot -ResourceGroupName $rgname -SnapshotName $snapshotname;
@@ -140,18 +146,22 @@ function Test-Snapshot
140146

141147
# Grant access test
142148
$job = Grant-AzureRmSnapshotAccess -ResourceGroupName $rgname -SnapshotName $snapshotname -Access $access -DurationInSecond 5 -AsJob;
143-
$job | Wait-Job;
149+
$result = $job | Wait-Job;
150+
Assert-AreEqual "Completed" $result.State;
144151
Revoke-AzureRmSnapshotAccess -ResourceGroupName $rgname -SnapshotName $snapshotname -AsJob;
145-
$job | Wait-Job;
152+
$result = $job | Wait-Job;
153+
Assert-AreEqual "Completed" $result.State;
146154

147155
# Config update test
148156
$updateconfig = New-AzureRmSnapshotUpdateConfig -DiskSizeGB 10 -AccountType PremiumLRS -OsType Windows;
149-
$job = Update-AzureRmSnapshot -ResourceGroupName $rgname -SnapshotName $snapshotname -SnapshotUpdate $updateconfig -AsJob
150-
$job | Wait-Job
157+
$job = Update-AzureRmSnapshot -ResourceGroupName $rgname -SnapshotName $snapshotname -SnapshotUpdate $updateconfig -AsJob;
158+
$result = $job | Wait-Job;
159+
Assert-AreEqual "Completed" $result.State;
151160

152161
# Remove test
153-
$job = Remove-AzureRmSnapshot -ResourceGroupName $rgname -SnapshotName $snapshotname -Force -AsJob
154-
$job | Wait-Job
162+
$job = Remove-AzureRmSnapshot -ResourceGroupName $rgname -SnapshotName $snapshotname -Force -AsJob;
163+
$result = $job | Wait-Job;
164+
Assert-AreEqual "Completed" $result.State;
155165
}
156166
finally
157167
{

‎src/ResourceManager/Compute/Commands.Compute.Test/ScenarioTests/ImageTests.ps1

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -103,9 +103,10 @@ function Test-Image
103103
$imageConfig = Remove-AzureRmImageDataDisk -Image $imageConfig -Lun 3;
104104
Assert-AreEqual 2 $imageConfig.StorageProfile.DataDisks.Count;
105105

106-
$job = New-AzureRmImage -Image $imageConfig -ImageName $imageName -ResourceGroupName $rgname -AsJob
107-
$job | Wait-Job
108-
$createdImage = $job | Receive-Job
106+
$job = New-AzureRmImage -Image $imageConfig -ImageName $imageName -ResourceGroupName $rgname -AsJob;
107+
$result = $job | Wait-Job;
108+
Assert-AreEqual "Completed" $result.State;
109+
$createdImage = $job | Receive-Job
109110

110111
# Verify Image properties
111112
Assert-NotNull $createdImage.Id;
@@ -121,8 +122,9 @@ function Test-Image
121122
$images = Get-AzureRmImage -ResourceGroupName $rgname;
122123
Assert-AreEqual 1 $images.Count;
123124

124-
$job = Remove-AzureRmImage -ResourceGroupName $rgname -ImageName $imageName -Force -AsJob
125-
$job | Wait-Job
125+
$job = Remove-AzureRmImage -ResourceGroupName $rgname -ImageName $imageName -Force -AsJob;
126+
$result = $job | Wait-Job;
127+
Assert-AreEqual "Completed" $result.State;
126128
$images = Get-AzureRmImage -ResourceGroupName $rgname;
127129
Assert-AreEqual 0 $images.Count;
128130

‎src/ResourceManager/Compute/Commands.Compute.Test/ScenarioTests/VirtualMachineNetworkInterfaceTests.ps1

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -491,9 +491,9 @@ function Test-EffectiveRoutesAndNsg
491491
$pubip = Get-AzureRmPublicIpAddress -Name ('pubip' + $rgname) -ResourceGroupName $rgname;
492492
$pubipId = $pubip.Id;
493493

494-
# Attach NSG to NIC
495-
$nsg = New-AzureRmNetworkSecurityGroup -Force -Name ('nsg' + $rgname) -ResourceGroupName $rgname -Location $loc
496-
$nsgId = $nsg.Id
494+
# Attach NSG to NIC
495+
$nsg = New-AzureRmNetworkSecurityGroup -Force -Name ('nsg' + $rgname) -ResourceGroupName $rgname -Location $loc
496+
$nsgId = $nsg.Id
497497

498498
$nic = New-AzureRmNetworkInterface -Force -Name ('nic' + $rgname) -ResourceGroupName $rgname -Location $loc -SubnetId $subnetId -PublicIpAddressId $pubip.Id -NetworkSecurityGroupId $nsgId;
499499
$nic = Get-AzureRmNetworkInterface -Name ('nic' + $rgname) -ResourceGroupName $rgname;
@@ -579,10 +579,11 @@ function Test-EffectiveRoutesAndNsg
579579
Assert-NotNull $getnic.MacAddress;
580580

581581
# Get Effective route by name
582-
$job = Get-AzureRmEffectiveRouteTable -ResourceGroupName $rgname -NetworkInterfaceName $getnic.Name -AsJob
583-
$job | Wait-Job
584-
$effectiveRoute = $job | Receive-Job
585-
Assert-NotNull $effectiveRoute[0].Source
582+
$job = Get-AzureRmEffectiveRouteTable -ResourceGroupName $rgname -NetworkInterfaceName $getnic.Name -AsJob;
583+
$result = $job | Wait-Job;
584+
Assert-AreEqual "Completed" $result.State;
585+
$effectiveRoute = $job | Receive-Job
586+
Assert-NotNull $effectiveRoute[0].Source
586587

587588
# Get Effective NSG by name
588589
$effectiveNsgs = Get-AzureRmEffectiveNetworkSecurityGroup -ResourceGroupName $rgname -NetworkInterfaceName $getnic.Name
@@ -626,7 +627,7 @@ function Test-SingleNetworkInterfaceWithAcceleratedNetworking
626627
$nic = New-AzureRmNetworkInterface -Force -Name ('nic' + $rgname) -ResourceGroupName $rgname -Location $loc -EnableAcceleratedNetworking -SubnetId $subnetId -PublicIpAddressId $pubip.Id;
627628
$nic = Get-AzureRmNetworkInterface -Name ('nic' + $rgname) -ResourceGroupName $rgname;
628629
$nicId = $nic.Id;
629-
Assert-AreEqual $nic.EnableAcceleratedNetworking $true
630+
Assert-AreEqual $nic.EnableAcceleratedNetworking $true
630631

631632
$p = Add-AzureRmVMNetworkInterface -VM $p -Id $nicId;
632633
Assert-AreEqual $p.NetworkProfile.NetworkInterfaces.Count 1;
@@ -700,11 +701,11 @@ function Test-SingleNetworkInterfaceWithAcceleratedNetworking
700701
Assert-AreEqual $vm1.Name $vmname;
701702
Assert-AreEqual $vm1.NetworkProfile.NetworkInterfaces.Count 1;
702703
Assert-AreEqual $vm1.NetworkProfile.NetworkInterfaces[0].Id $nicId;
703-
704+
704705
# Get NetworkInterface
705706
$getnic = Get-AzureRmNetworkInterface -Name ('nic' + $rgname) -ResourceGroupName $rgname;
706707
Assert-AreEqual $vm1.NetworkProfile.NetworkInterfaces[0].Id $getnic.Id;
707-
Assert-AreEqual $getnic.EnableAcceleratedNetworking $true
708+
Assert-AreEqual $getnic.EnableAcceleratedNetworking $true
708709

709710
# Remove
710711
Remove-AzureRmVM -Name $vmname -ResourceGroupName $rgname -Force;
@@ -748,7 +749,7 @@ function Test-VMNicWithAcceleratedNetworkingValidations
748749
$nic = New-AzureRmNetworkInterface -Force -Name ('nic' + $rgname) -ResourceGroupName $rgname -Location $loc -EnableAcceleratedNetworking -SubnetId $subnetId -PublicIpAddressId $pubip.Id;
749750
$nic = Get-AzureRmNetworkInterface -Name ('nic' + $rgname) -ResourceGroupName $rgname;
750751
$nicId = $nic.Id;
751-
Assert-AreEqual $nic.EnableAcceleratedNetworking $true
752+
Assert-AreEqual $nic.EnableAcceleratedNetworking $true
752753

753754
$p = Add-AzureRmVMNetworkInterface -VM $p -Id $nicId;
754755
Assert-AreEqual $p.NetworkProfile.NetworkInterfaces.Count 1;
@@ -822,11 +823,11 @@ function Test-VMNicWithAcceleratedNetworkingValidations
822823
Assert-AreEqual $vm1.Name $vmname;
823824
Assert-AreEqual $vm1.NetworkProfile.NetworkInterfaces.Count 1;
824825
Assert-AreEqual $vm1.NetworkProfile.NetworkInterfaces[0].Id $nicId;
825-
826+
826827
# Get NetworkInterface
827828
$getnic = Get-AzureRmNetworkInterface -Name ('nic' + $rgname) -ResourceGroupName $rgname;
828829
Assert-AreEqual $vm1.NetworkProfile.NetworkInterfaces[0].Id $getnic.Id;
829-
Assert-AreEqual $getnic.EnableAcceleratedNetworking $true
830+
Assert-AreEqual $getnic.EnableAcceleratedNetworking $true
830831

831832
# Remove
832833
Remove-AzureRmVM -Name $vmname -ResourceGroupName $rgname -Force;

‎src/ResourceManager/Compute/Commands.Compute.Test/ScenarioTests/VirtualMachineRunCommandTests.ps1

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -107,13 +107,11 @@ function Test-VirtualMachineSetRunCommand
107107

108108
$path = 'ScenarioTests\test.ps1';
109109

110-
$job = Invoke-AzureRmVMRunCommand -ResourceGroupName $rgname -Name $vmname -CommandId $commandId -ScriptPath $path -Parameter $param -AsJob
111-
$job | Wait-Job
110+
$result = Invoke-AzureRmVMRunCommand -ResourceGroupName $rgname -Name $vmname -CommandId $commandId -ScriptPath $path -Parameter $param;
111+
Assert-AreEqual "Succeeded" $result.Status
112112

113113
# Remove All VMs
114114
Get-AzureRmVM -ResourceGroupName $rgname | Remove-AzureRmVM -Force;
115-
$vms = Get-AzureRmVM -ResourceGroupName $rgname;
116-
Assert-AreEqual $vms $null;
117115
}
118116
finally
119117
{

‎src/ResourceManager/Compute/Commands.Compute.Test/ScenarioTests/VirtualMachineScaleSetExtensionTests.ps1

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -306,8 +306,9 @@ function Test-GetVirtualMachineScaleSetDiskEncryptionDataDisk
306306
Assert-AreEqual "Encrypted" $result.DataVolumesEncrypted;
307307
$output = $result | Out-String;
308308

309-
$job = Disable-AzureRmVmssDiskEncryption -ResourceGroupName $rgname -VMScaleSetName $vmssName -Force -AsJob
310-
$job | Wait-Job
309+
$job = Disable-AzureRmVmssDiskEncryption -ResourceGroupName $rgname -VMScaleSetName $vmssName -Force -AsJob;
310+
$result = $job | Wait-Job;
311+
Assert-AreEqual "Completed" $result.State;
311312

312313
$result = Get-AzureRmVmssDiskEncryption -ResourceGroupName $rgname;
313314
$output = $result | Out-String;

0 commit comments

Comments
 (0)