Skip to content

Commit 23efe2b

Browse files
author
Maddie Clayton
committed
add more tests
1 parent 19a1226 commit 23efe2b

16 files changed

+56
-55
lines changed

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

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,8 @@ function Test-Snapshot
125125
$snapshotconfig.EncryptionSettings.DiskEncryptionKey = $null;
126126
$snapshotconfig.EncryptionSettings.KeyEncryptionKey = $null;
127127
$snapshotconfig.CreationData.ImageReference = $null;
128-
New-AzureRmSnapshot -ResourceGroupName $rgname -SnapshotName $snapshotname -Snapshot $snapshotconfig;
128+
$job = New-AzureRmSnapshot -ResourceGroupName $rgname -SnapshotName $snapshotname -Snapshot $snapshotconfig -AsJob
129+
$job | Wait-Job
129130

130131
# Get snapshot test
131132
$snapshot = Get-AzureRmSnapshot -ResourceGroupName $rgname -SnapshotName $snapshotname;
@@ -141,10 +142,12 @@ function Test-Snapshot
141142

142143
# Config update test
143144
$updateconfig = New-AzureRmSnapshotUpdateConfig -DiskSizeGB 10 -AccountType PremiumLRS -OsType Windows;
144-
Update-AzureRmSnapshot -ResourceGroupName $rgname -SnapshotName $snapshotname -SnapshotUpdate $updateconfig;
145+
$job = Update-AzureRmSnapshot -ResourceGroupName $rgname -SnapshotName $snapshotname -SnapshotUpdate $updateconfig -AsJob
146+
$job | Wait-Job
145147

146148
# Remove test
147-
Remove-AzureRmSnapshot -ResourceGroupName $rgname -SnapshotName $snapshotname -Force;
149+
$job = Remove-AzureRmSnapshot -ResourceGroupName $rgname -SnapshotName $snapshotname -Force -AsJob
150+
$job | Wait-Job
148151
}
149152
finally
150153
{

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -103,9 +103,7 @@ 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+
$createdImage = New-AzureRmImage -Image $imageConfig -ImageName $imageName -ResourceGroupName $rgname
109107

110108
# Verify Image properties
111109
Assert-NotNull $createdImage.Id;
@@ -121,7 +119,7 @@ function Test-Image
121119
$images = Get-AzureRmImage -ResourceGroupName $rgname;
122120
Assert-AreEqual 1 $images.Count;
123121

124-
$job = Remove-AzureRmImage -ResourceGroupName $rgname -ImageName $imageName -Force -AsJob;
122+
$job = Remove-AzureRmImage -ResourceGroupName $rgname -ImageName $imageName -Force -AsJob
125123
$job | Wait-Job
126124
$images = Get-AzureRmImage -ResourceGroupName $rgname;
127125
Assert-AreEqual 0 $images.Count;

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,8 @@ function Test-VirtualMachineExtension
118118
# Set extension settings by raw strings
119119
$settingstr = '{"fileUris":[],"commandToExecute":"powershell Get-Process"}';
120120
$protectedsettingstr = '{"storageAccountName":"' + $stoname + '","storageAccountKey":"' + $stokey + '"}';
121-
Set-AzureRmVMExtension -ResourceGroupName $rgname -Location $loc -VMName $vmname -Name $extname -Publisher $publisher -ExtensionType $exttype -TypeHandlerVersion $extver -SettingString $settingstr -ProtectedSettingString $protectedsettingstr;
121+
$job = Set-AzureRmVMExtension -ResourceGroupName $rgname -Location $loc -VMName $vmname -Name $extname -Publisher $publisher -ExtensionType $exttype -TypeHandlerVersion $extver -SettingString $settingstr -ProtectedSettingString $protectedsettingstr -AsJob
122+
$job | Wait-Job
122123

123124
# Get VM Extension
124125
$ext = Get-AzureRmVMExtension -ResourceGroupName $rgname -VMName $vmname -Name $extname;

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,9 @@ function Test-VirtualMachineSetRunCommand
107107

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

110-
$result = Invoke-AzureRmVMRunCommand -ResourceGroupName $rgname -Name $vmname -CommandId $commandId -ScriptPath $path -Parameter $param;
110+
$job = Invoke-AzureRmVMRunCommand -ResourceGroupName $rgname -Name $vmname -CommandId $commandId -ScriptPath $path -Parameter $param -AsJob
111+
$job | Wait-Job
112+
$result = $job | Receive-Job
111113
$result_output = $result | Out-String;
112114

113115
# Remove All VMs

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ function Test-VirtualMachineScaleSetDiskEncryptionExtension
109109
Set-AzureRmVmssDiskEncryptionExtension -ResourceGroupName $rgname -VMScaleSetName $vmssName `
110110
-AadClientID $aadClientID -AadClientSecret $aadClientSecret `
111111
-DiskEncryptionKeyVaultUrl $diskEncryptionKeyVaultUrl -DiskEncryptionKeyVaultId $keyVaultResourceId `
112-
-KeyEncryptionKeyUrl $keyEncryptionKeyUrl -KeyEncryptionKeyVaultId $keyVaultResourceId -Force;
112+
-KeyEncryptionKeyUrl $keyEncryptionKeyUrl -KeyEncryptionKeyVaultId $keyVaultResourceId -Force
113113

114114
$result = Get-AzureRmVmssDiskEncryption -ResourceGroupName $rgname -VMScaleSetName $vmssName;
115115
$result_string = $result | Out-String;
@@ -306,7 +306,8 @@ function Test-GetVirtualMachineScaleSetDiskEncryptionDataDisk
306306
Assert-AreEqual "Encrypted" $result.DataVolumesEncrypted;
307307
$output = $result | Out-String;
308308

309-
Disable-AzureRmVmssDiskEncryption -ResourceGroupName $rgname -VMScaleSetName $vmssName -Force;
309+
$job = Disable-AzureRmVmssDiskEncryption -ResourceGroupName $rgname -VMScaleSetName $vmssName -Force -AsJob
310+
$job | Wait-Job
310311

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

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

Lines changed: 20 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,9 @@ function Test-VirtualMachineScaleSet-Common($IsManaged)
142142
Assert-AreEqual "1" $vmss.Zones
143143
$vmss.Zones = $null
144144

145-
$vmss = New-AzureRmVmss -ResourceGroupName $rgname -Name $vmssName -VirtualMachineScaleSet $vmss;
145+
$job = New-AzureRmVmss -ResourceGroupName $rgname -Name $vmssName -VirtualMachineScaleSet $vmss -AsJob
146+
$job | Wait-Job
147+
$vmss = $job | Receive-Job
146148

147149
Assert-AreEqual $loc $vmss.Location;
148150
Assert-AreEqual 2 $vmss.Sku.Capacity;
@@ -235,13 +237,20 @@ function Test-VirtualMachineScaleSet-Common($IsManaged)
235237
}
236238

237239
$st = $vmssResult | Stop-AzureRmVmss -StayProvision -Force;
238-
$st = $vmssResult | Stop-AzureRmVmss -Force;
239-
$st = $vmssResult | Start-AzureRmVmss;
240-
$st = $vmssResult | Restart-AzureRmVmss;
240+
$job = $vmssResult | Stop-AzureRmVmss -Force -AsJob
241+
$job | Wait-Job
242+
$st = $job | Receive-Job
243+
$job = $vmssResult | Start-AzureRmVmss -AsJob
244+
$job | Wait-Job
245+
$st = $job | Receive-Job
246+
$job = $vmssResult | Restart-AzureRmVmss -AsJob
247+
$job | Wait-Job
248+
$st = $job | Receive-Job
241249

242250
if ($IsManaged -eq $true)
243251
{
244-
$st = $vmssResult | Set-AzureRmVmss -ReimageAll;
252+
$job = $vmssResult | Set-AzureRmVmss -ReimageAll -AsJob
253+
$job | Wait-Job
245254
}
246255
$instanceListParam = @();
247256
for ($i = 0; $i -lt 2; $i++)
@@ -263,7 +272,8 @@ function Test-VirtualMachineScaleSet-Common($IsManaged)
263272

264273
# Remove
265274
$st = Remove-AzureRmVmss -ResourceGroupName $rgname -VMScaleSetName $vmssName -InstanceId 1 -Force;
266-
$st = $vmssResult | Remove-AzureRmVmss -Force;
275+
$job = $vmssResult | Remove-AzureRmVmss -Force -AsJob
276+
$job | Wait-Job
267277
}
268278
finally
269279
{
@@ -368,7 +378,8 @@ function Test-VirtualMachineScaleSetUpdate
368378
"Cannot specify both Windows and Linux configurations.";
369379

370380
$tags = @{test1 = "testval1"; test2 = "testval2" };
371-
Update-AzureRmVmss -ResourceGroupName $rgname -Name $vmssName -Tag $tags -SkuCapacity 3;
381+
$job = Update-AzureRmVmss -ResourceGroupName $rgname -Name $vmssName -Tag $tags -SkuCapacity 3 -AsJob
382+
$job | Wait-Job
372383

373384
$vmss = Get-AzureRmVmss -ResourceGroupName $rgname -VMScaleSetName $vmssName;
374385
$returned_tags = $vmss.Tags;
@@ -502,7 +513,8 @@ function Test-VirtualMachineScaleSetReimageUpdate
502513
$vmssVMs = Get-AzureRmVmssVM -ResourceGroupName $rgname -VMScaleSetName $vmssName
503514
$id = $vmssVMs[0].InstanceId
504515

505-
Update-AzureRmVmssInstance -ResourceGroupName $rgname -VMScaleSetName $vmssName -InstanceId $id;
516+
$job = Update-AzureRmVmssInstance -ResourceGroupName $rgname -VMScaleSetName $vmssName -InstanceId $id -AsJob
517+
$job | Wait-Job
506518
$vmssResult = Get-AzureRmVmss -ResourceGroupName $rgname -VMScaleSetName $vmssName;
507519
$vmssInstanceViewResult = Get-AzureRmVmss -ResourceGroupName $rgname -VMScaleSetName $vmssName -InstanceView;
508520
Assert-AreEqual "ProvisioningState/succeeded" $vmssInstanceViewResult.VirtualMachine.StatusesSummary[0].Code;

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

Lines changed: 17 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -160,9 +160,12 @@ function Test-VirtualMachine
160160
Assert-AreEqual "BGInfo" $vm1.Extensions[0].VirtualMachineExtensionType
161161
Assert-AreEqual "Microsoft.Compute" $vm1.Extensions[0].Publisher
162162

163-
Start-AzureRmVM -Name $vmname -ResourceGroupName $rgname;
164-
Restart-AzureRmVM -Name $vmname -ResourceGroupName $rgname;
165-
Stop-AzureRmVM -Name $vmname -ResourceGroupName $rgname -Force -StayProvisioned;
163+
$job = Start-AzureRmVM -Name $vmname -ResourceGroupName $rgname -AsJob
164+
$job | Wait-Job
165+
$job = Restart-AzureRmVM -Name $vmname -ResourceGroupName $rgname -AsJob
166+
$job | Wait-Job
167+
$job = Stop-AzureRmVM -Name $vmname -ResourceGroupName $rgname -Force -StayProvisioned -AsJob
168+
$job | Wait-Job
166169

167170
# Update
168171
$p.Location = $vm1.Location;
@@ -204,8 +207,9 @@ function Test-VirtualMachine
204207
Assert-True {$a.Contains("Sku");}
205208

206209
# Remove All VMs
207-
Get-AzureRmVM -ResourceGroupName $rgname | Remove-AzureRmVM -ResourceGroupName $rgname -Force;
208-
$vms = Get-AzureRmVM -ResourceGroupName $rgname;
210+
$job = Get-AzureRmVM -ResourceGroupName $rgname | Remove-AzureRmVM -ResourceGroupName $rgname -Force -AsJob
211+
$job | Wait-Job
212+
$vms = Get-AzureRmVM -ResourceGroupName $rgname;
209213
Assert-AreEqual $vms $null;
210214

211215
# Availability Set
@@ -380,7 +384,8 @@ function Test-VirtualMachinePiping
380384

381385
$dest = Get-ComputeTestResourceName;
382386
$templatePath = "$TestOutputRoot\template.txt";
383-
Get-AzureRmVM -ResourceGroupName $rgname | Save-AzureRmVMImage -DestinationContainerName $dest -VHDNamePrefix 'pslib' -Overwrite -Path $templatePath;
387+
$job = Get-AzureRmVM -ResourceGroupName $rgname | Save-AzureRmVMImage -DestinationContainerName $dest -VHDNamePrefix 'pslib' -Overwrite -Path $templatePath -AsJob
388+
$job | Wait-Job
384389

385390
$template = Get-Content $templatePath;
386391
Assert-True { $template[1].Contains("$schema"); }
@@ -456,7 +461,8 @@ function Test-VirtualMachineUpdateWithoutNic
456461
| Set-AzureRmVMOperatingSystem -Windows -ComputerName $computerName -Credential $cred;
457462

458463
$imgRef = Get-DefaultCRPImage -loc $loc;
459-
$imgRef | Set-AzureRmVMSourceImage -VM $p | New-AzureRmVM -ResourceGroupName $rgname -Location $loc;
464+
$job = $imgRef | Set-AzureRmVMSourceImage -VM $p | New-AzureRmVM -ResourceGroupName $rgname -Location $loc -AsJob
465+
$job | Wait-Job
460466

461467
# Get VM
462468
$vm1 = Get-AzureRmVM -Name $vmname -ResourceGroupName $rgname;
@@ -1314,7 +1320,8 @@ function Test-VirtualMachineDataDisk
13141320
$vm1 = Add-AzureRmVMDataDisk -VM $vm1 -Name $dataDiskName3 -Caching 'ReadOnly' -DiskSizeInGB 12 -Lun 3 -VhdUri $dataDiskVhdUri3 -CreateOption Empty;
13151321

13161322
# Update
1317-
Update-AzureRmVM -ResourceGroupName $rgname -VM $vm1;
1323+
$job = Update-AzureRmVM -ResourceGroupName $rgname -VM $vm1 -AsJob
1324+
$job | Wait-Job
13181325

13191326
$vm2 = Get-AzureRmVM -Name $vmname -ResourceGroupName $rgname;
13201327
Assert-AreEqual $vm2.NetworkProfile.NetworkInterfaces.Count 1;
@@ -2693,7 +2700,8 @@ function Test-VirtualMachineRedeploy
26932700
Assert-NotNull $vm2.Location;
26942701

26952702
# Redeploy the VM
2696-
Set-AzureRmVM -ResourceGroupName $rgname -Name $vmname -Redeploy;
2703+
$job = Set-AzureRmVM -ResourceGroupName $rgname -Name $vmname -Redeploy -AsJob
2704+
$job | Wait-Job
26972705

26982706
$vm2 = Get-AzureRmVM -Name $vmname -ResourceGroupName $rgname;
26992707

‎src/ResourceManager/Compute/Commands.Compute/Extension/RemoveAzureVMExtensionCommand.cs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,9 +56,6 @@ public class RemoveAzureVMExtensionCommand : VirtualMachineExtensionBaseCmdlet
5656
[ValidateNotNullOrEmpty]
5757
public SwitchParameter Force { get; set; }
5858

59-
[Parameter(Mandatory = false, HelpMessage = "Run cmdlet in the background")]
60-
public SwitchParameter AsJob { get; set; }
61-
6259
public override void ExecuteCmdlet()
6360
{
6461
base.ExecuteCmdlet();

‎src/ResourceManager/Compute/Commands.Compute/Extension/VmssDiskEncryption/SetAzureVmssDiskEncryptionExtension.cs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -139,9 +139,6 @@ public class SetAzureVmssDiskEncryptionExtensionCommand : VirtualMachineScaleSet
139139
HelpMessage = "Disable auto-upgrade of minor version")]
140140
public SwitchParameter DisableAutoUpgradeMinorVersion { get; set; }
141141

142-
[Parameter(Mandatory = false, HelpMessage = "Run cmdlet in the background")]
143-
public SwitchParameter AsJob { get; set; }
144-
145142
private Hashtable GetExtensionPublicSettings()
146143
{
147144
Hashtable publicSettings = new Hashtable();

‎src/ResourceManager/Compute/Commands.Compute/Generated/Snapshot/SnapshotGrantAccessMethod.cs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -185,8 +185,5 @@ protected override void ProcessRecord()
185185
Mandatory = false)]
186186
[AllowNull]
187187
public int DurationInSecond { get; set; }
188-
189-
[Parameter(Mandatory = false, HelpMessage = "Run cmdlet in the background")]
190-
public SwitchParameter AsJob { get; set; }
191188
}
192189
}

‎src/ResourceManager/Compute/Commands.Compute/Generated/Snapshot/SnapshotRevokeAccessMethod.cs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -137,8 +137,5 @@ protected override void ProcessRecord()
137137
[Alias("Name")]
138138
[AllowNull]
139139
public string SnapshotName { get; set; }
140-
141-
[Parameter(Mandatory = false, HelpMessage = "Run cmdlet in the background")]
142-
public SwitchParameter AsJob { get; set; }
143140
}
144141
}

‎src/ResourceManager/Compute/Commands.Compute/Generated/VirtualMachine/VirtualMachineConvertToManagedDisksMethod.cs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -137,8 +137,5 @@ protected override void ProcessRecord()
137137
[Alias("Name")]
138138
[AllowNull]
139139
public string VMName { get; set; }
140-
141-
[Parameter(Mandatory = false, HelpMessage = "Run cmdlet in the background")]
142-
public SwitchParameter AsJob { get; set; }
143140
}
144141
}

‎src/ResourceManager/Compute/Commands.Compute/Generated/VirtualMachine/VirtualMachineRunCommandMethod.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -160,9 +160,6 @@ public override void ExecuteCmdlet()
160160
});
161161
}
162162

163-
[Parameter(Mandatory = false, HelpMessage = "Run cmdlet in the background")]
164-
public SwitchParameter AsJob { get; set; }
165-
166163
[Parameter(
167164
ParameterSetName = "DefaultParameter",
168165
Position = 1,
@@ -207,5 +204,8 @@ public override void ExecuteCmdlet()
207204
ValueFromPipeline = true)]
208205
[ValidateNotNullOrEmpty]
209206
public Compute.Models.PSVirtualMachine VM { get; set; }
207+
208+
[Parameter(Mandatory = false, HelpMessage = "Run cmdlet in the background")]
209+
public SwitchParameter AsJob { get; set; }
210210
}
211211
}

‎src/ResourceManager/Compute/Commands.Compute/Generated/VirtualMachineScaleSetRollingUpgrade/VirtualMachineScaleSetRollingUpgradeCancelMethod.cs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -149,8 +149,5 @@ protected override void ProcessRecord()
149149
Mandatory = false)]
150150
[AllowNull]
151151
public SwitchParameter Force { get; set; }
152-
153-
[Parameter(Mandatory = false, HelpMessage = "Run cmdlet in the background")]
154-
public SwitchParameter AsJob { get; set; }
155152
}
156153
}

‎src/ResourceManager/Compute/Commands.Compute/Generated/VirtualMachineScaleSetRollingUpgrade/VirtualMachineScaleSetRollingUpgradeStartOSUpgradeMethod.cs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -137,8 +137,5 @@ protected override void ProcessRecord()
137137
[Alias("Name")]
138138
[AllowNull]
139139
public string VMScaleSetName { get; set; }
140-
141-
[Parameter(Mandatory = false, HelpMessage = "Run cmdlet in the background")]
142-
public SwitchParameter AsJob { get; set; }
143140
}
144141
}

‎src/ResourceManager/Compute/Commands.Compute/Generated/VirtualMachineScaleSetVM/VirtualMachineScaleSetVMReimageMethod.cs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -202,8 +202,5 @@ protected override void ProcessRecord()
202202
Mandatory = true)]
203203
[AllowNull]
204204
public SwitchParameter ReimageAll { get; set; }
205-
206-
[Parameter(Mandatory = false, HelpMessage = "Run cmdlet in the background")]
207-
public SwitchParameter AsJob { get; set; }
208205
}
209206
}

0 commit comments

Comments
 (0)