Skip to content

Commit 9db50ba

Browse files
authored
Replace Start-Sleep with Start-TestSleep to avoid waiting during playback (#24463)
1 parent 6662216 commit 9db50ba

File tree

26 files changed

+225
-254
lines changed

26 files changed

+225
-254
lines changed

src/ADDomainServices/ADDomainServices.Autorest/test/Remove-AzADDomainService.Tests.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ Describe 'Remove-AzADDomainService' {
2121
It 'DeleteViaIdentity' {
2222
$ReplicaSet = New-AzADDomainServiceReplicaSetObject -Location $env.Location -SubnetId $env.SubnetId
2323
$NewAdDomain = New-AzADDomainService -name $env.ADdomainName -ResourceGroupName $env.ResourceGroupName -DomainName $env.ADDomainNameCom -ReplicaSet $ReplicaSet
24-
# Start-Sleep -s 120
24+
Start-TestSleep 120
2525
$GetADDomainExample = Get-AzADDomainService -ResourceGroupName $env.ResourceGroupName -Name $env.ADdomainName
2626
Remove-AzADDomainService -InputObject $GetADDomainExample
2727
$GetADDomainList = Get-AzADDomainService

src/ADDomainServices/ADDomainServices.Autorest/test/Update-AzADDomainService.Tests.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ Describe 'Update-AzADDomainService' {
1818
}
1919

2020
It 'UpdateViaIdentityExpanded' {
21-
# Start-Sleep -s 240
21+
Start-TestSleep 240
2222
$GetADDomainExample = Get-AzADDomainService -ResourceGroupName $env.ResourceGroupName -Name $env.ADdomainName
2323
$UpdateADDomain = Update-AzADDomainService -InputObject $GetADDomainExample -DomainSecuritySettingTlsV1 $env.TlsV1Status2
2424
$UpdateADDomain.DomainSecuritySettingTlsV1 | Should -Be $env.TlsV1Status2

src/DataMigration/DataMigration.Autorest/test/Remove-AzDataMigrationToSqlDb.Tests.ps1

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,16 +20,16 @@ Describe 'Remove-AzDataMigrationToSqlDb' {
2020
$sourcePassword = ConvertTo-SecureString $env.TestDeleteDatabaseMigrationDb.SourceSqlConnectionPassword -AsPlainText -Force
2121

2222
$instance = New-AzDataMigrationToSqlDb -ResourceGroupName $env.TestDeleteDatabaseMigrationDb.ResourceGroupName -SqlDbInstanceName $env.TestDeleteDatabaseMigrationDb.SqlDbInstanceName -MigrationService $env.TestDeleteDatabaseMigrationDb.MigrationService -TargetSqlConnectionAuthentication $env.TestDeleteDatabaseMigrationDb.TargetSqlConnectionAuthentication -TargetSqlConnectionDataSource $env.TestDeleteDatabaseMigrationDb.TargetSqlConnectionDataSource -TargetSqlConnectionPassword $targetPassword -TargetSqlConnectionUserName $env.TestDeleteDatabaseMigrationDb.TargetSqlConnectionUserName -SourceSqlConnectionAuthentication $env.TestDeleteDatabaseMigrationDb.SourceSqlConnectionAuthentication -SourceSqlConnectionDataSource $env.TestDeleteDatabaseMigrationDb.SourceSqlConnectionDataSource -SourceSqlConnectionUserName $env.TestDeleteDatabaseMigrationDb.SourceSqlConnectionUserName -SourceSqlConnectionPassword $sourcePassword -SourceDatabaseName $env.TestDeleteDatabaseMigrationDb.SourceDatabaseName -TargetDbName $env.TestDeleteDatabaseMigrationDb.TargetDbName -Scope $env.TestDeleteDatabaseMigrationDb.Scope
23-
24-
Start-Sleep -Seconds 5
23+
24+
Start-TestSleep -Seconds 5
2525

2626
Remove-AzDataMigrationToSqlDb -ResourceGroupName $env.TestDeleteDatabaseMigrationDb.ResourceGroupName -SqlDbInstanceName $env.TestDeleteDatabaseMigrationDb.SqlDbInstanceName -TargetDbName $env.TestDeleteDatabaseMigrationDb.TargetDbName -Force
2727

28-
Start-Sleep -Seconds 5
29-
30-
28+
Start-TestSleep -Seconds 5
29+
30+
3131
$dbMig = Get-AzDataMigrationToSqlDb -ResourceGroupName $env.TestDeleteDatabaseMigrationDb.ResourceGroupName -SqlDbInstanceName $env.TestDeleteDatabaseMigrationDb.SqlDbInstanceName -TargetDbName $env.TestDeleteDatabaseMigrationDb.TargetDbName -ErrorAction SilentlyContinue
32-
32+
3333

3434
$assert = ($dbMig -eq $null)
3535
$assert | Should be $true

src/DataProtection/DataProtection.Autorest/test/Backup-AzDataProtectionBackupInstanceAdhoc.Tests.ps1

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ Describe 'Backup-AzDataProtectionBackupInstanceAdhoc' {
2828
$jobstatus = "InProgress"
2929
while($jobstatus -eq "InProgress")
3030
{
31-
Start-Sleep -Seconds 5
31+
Start-TestSleep -Seconds 5
3232
$currentjob = Get-AzDataProtectionJob -Id $jobid -SubscriptionId $sub -ResourceGroupName $rgName -VaultName $vaultName
3333
$jobstatus = $currentjob.Status
3434
}
@@ -38,21 +38,21 @@ Describe 'Backup-AzDataProtectionBackupInstanceAdhoc' {
3838

3939
It 'OssBackup' {
4040
# Test trigger Backup for Oss DB
41-
# Delete this test
41+
# Delete this test
4242
$sub = $env.TestOssBackupScenario.SubscriptionId
4343
$rgName = $env.TestOssBackupScenario.ResourceGroupName
4444
$vaultName = $env.TestOssBackupScenario.VaultName
45-
$policyName = $env.TestOssBackupScenario.PolicyName
45+
$policyName = $env.TestOssBackupScenario.PolicyName
4646
$dataSourceId = $env.TestOssBackupScenario.OssDbId
4747
$serverName = $env.TestOssBackupScenario.OssServerName
4848
$keyVault = $env.TestOssBackupScenario.KeyVault
4949
$secretURI = $env.TestOssBackupScenario.SecretURI
50-
50+
5151
$vault = Get-AzDataProtectionBackupVault -SubscriptionId $sub -ResourceGroupName $rgName -VaultName $vaultName
5252
$policy = Get-AzDataProtectionBackupPolicy -SubscriptionId $sub -VaultName $vaultName -ResourceGroupName $rgName | where {$_.Name -eq $policyName}
5353

5454
$instance = Get-AzDataProtectionBackupInstance -Subscription $sub -ResourceGroup $rgName -Vault $vaultName | Where-Object {($_.Property.DataSourceInfo.Type -eq "Microsoft.DBforPostgreSQL/servers/databases") -and ($_.Property.DataSourceInfo.ResourceId -match $serverName)}
55-
55+
5656
($instance -ne $null) | Should be $true
5757

5858
$backupJob = Backup-AzDataProtectionBackupInstanceAdhoc -BackupInstanceName $instance.Name -ResourceGroupName $rgName -SubscriptionId $sub -VaultName $vaultName -BackupRuleOptionRuleName $policy.Property.PolicyRule[0].Name -TriggerOptionRetentionTagOverride $policy.Property.PolicyRule[0].Trigger.TaggingCriterion[0].TagInfoTagName
@@ -61,7 +61,7 @@ Describe 'Backup-AzDataProtectionBackupInstanceAdhoc' {
6161
$jobstatus = "InProgress"
6262
while($jobstatus -ne "Completed")
6363
{
64-
Start-Sleep -Seconds 10
64+
Start-TestSleep -Seconds 10
6565
$currentjob = Get-AzDataProtectionJob -Id $jobid -SubscriptionId $sub -ResourceGroupName $rgName -VaultName $vaultName
6666
$jobstatus = $currentjob.Status
6767
}

src/DataProtection/DataProtection.Autorest/test/BlobHardeningScenario.Tests.ps1

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -23,34 +23,34 @@ Describe 'BlobHardeningScenario' {
2323

2424
$vault = Get-AzDataProtectionBackupVault -SubscriptionId $subId -ResourceGroupName $resourceGroupName -VaultName $vaultName
2525
$pol = Get-AzDataProtectionBackupPolicy -SubscriptionId $subId -VaultName $vaultName -ResourceGroupName $resourceGroupName | Where { $_.Name -match $policyName }
26-
26+
2727
$instance = Get-AzDataProtectionBackupInstance -SubscriptionId $subId -ResourceGroupName $resourceGroupName -VaultName $vaultName | Where { $_.Name -match $storageAcountName }
2828

2929
# Remove-BI
3030
if($instance -ne $null){
3131
Remove-AzDataProtectionBackupInstance -Name $instance[0].Name -SubscriptionId $subId -ResourceGroupName $resourceGroupName -VaultName $vaultName
3232
}
3333

34-
Start-Sleep -Seconds 8
34+
Start-TestSleep -Seconds 8
3535

3636
# new backup config and initialize BI
37-
38-
$storageAccount = Get-AzStorageAccount -ResourceGroupName $resourceGroupName -Name $storageAccountName
37+
38+
$storageAccount = Get-AzStorageAccount -ResourceGroupName $resourceGroupName -Name $storageAccountName
3939
$containers=Get-AzStorageContainer -Context $storageAccount.Context
40-
41-
$backupConfig = New-AzDataProtectionBackupConfigurationClientObject -DatasourceType AzureBlob -VaultedBackupContainer $containers.Name
40+
41+
$backupConfig = New-AzDataProtectionBackupConfigurationClientObject -DatasourceType AzureBlob -VaultedBackupContainer $containers.Name
4242
$backupConfig.ContainersList = $backupConfig.ContainersList[1,3,4]
4343

4444
$backupInstanceClientObject = Initialize-AzDataProtectionBackupInstance -DatasourceType AzureBlob -DatasourceLocation $vault.Location -PolicyId $pol[0].Id -DatasourceId $storageAccId -BackupConfiguration $backupConfig
4545

46-
# assign permissions and validate
46+
# assign permissions and validate
4747
Set-AzDataProtectionMSIPermission -VaultResourceGroup $resourceGroupName -VaultName $vaultName -BackupInstance $backupInstanceClientObject -PermissionsScope ResourceGroup
4848

4949
$operationResponse = Test-AzDataProtectionBackupInstanceReadiness -ResourceGroupName $resourceGroupName -VaultName $vaultName -SubscriptionId $subId -BackupInstance $backupInstanceClientObject.Property -NoWait
5050
$operationId = $operationResponse.Target.Split("/")[-1].Split("?")[0]
51-
51+
5252
While((Get-AzDataProtectionOperationStatus -OperationId $operationId -Location $vault.Location -SubscriptionId $subId).Status -eq "Inprogress"){
53-
Start-Sleep -Seconds 10
53+
Start-TestSleep -Seconds 10
5454
}
5555

5656
# backup
@@ -59,7 +59,7 @@ Describe 'BlobHardeningScenario' {
5959
$instance = Get-AzDataProtectionBackupInstance -SubscriptionId $subId -ResourceGroupName $resourceGroupName -VaultName $vaultName | Where { $_.Name -match $storageAcountName }
6060

6161
while($instance.Property.CurrentProtectionState -ne "ProtectionConfigured"){
62-
Start-Sleep -Seconds 10
62+
Start-TestSleep -Seconds 10
6363
$instance = Get-AzDataProtectionBackupInstance -SubscriptionId $subId -ResourceGroupName $resourceGroupName -VaultName $vaultName | Where { $_.Name -match $storageAcountName }
6464
}
6565

@@ -74,15 +74,15 @@ Describe 'BlobHardeningScenario' {
7474
$jobstatus = "InProgress"
7575
while($jobstatus -ne "Completed")
7676
{
77-
Start-Sleep -Seconds 10
77+
Start-TestSleep -Seconds 10
7878
$currentjob = Get-AzDataProtectionJob -Id $jobid -SubscriptionId $subId -ResourceGroupName $resourceGroupName -VaultName $vaultName
7979
$jobstatus = $currentjob.Status
8080
}
81-
$jobstatus | Should be "Completed"
81+
$jobstatus | Should be "Completed"
8282
}
8383

8484
It 'TriggerRestore' -skip {
85-
# TODO: OLR should throw an error in case of vaulted backups
85+
# TODO: OLR should throw an error in case of vaulted backups
8686

8787
$subId = $env.TestBlobHardeningScenario.SubscriptionId
8888
$crossSubscriptionId = $env.TestBlobHardeningScenario.CrossSubscriptionId
@@ -112,7 +112,7 @@ Describe 'BlobHardeningScenario' {
112112
foreach($crossSubContainerName in $targetCrossSubContainers.Name){
113113
Remove-AzStorageContainer -Context $targetCrossSubStorageAccount.Context -Name $crossSubContainerName -Confirm:$false -Force
114114
}
115-
115+
116116
# remove containers in target storage account
117117
Set-AzContext -SubscriptionId $subId
118118
$targetStorageAccount = Get-AzStorageAccount -ResourceGroupName $targetStorageAccountRGName -Name $targetStorageAccountName
@@ -128,7 +128,7 @@ Describe 'BlobHardeningScenario' {
128128
$validateRestore.ObjectType | Should be "OperationJobExtendedInfo"
129129

130130
$restoreJob = Start-AzDataProtectionBackupInstanceRestore -SubscriptionId $subId -ResourceGroupName $resourceGroupName -VaultName $vaultName -BackupInstanceName $instance.BackupInstanceName -Parameter $restoreReq
131-
131+
132132
$restoreReqCSR = Initialize-AzDataProtectionRestoreRequest -DatasourceType AzureBlob -SourceDataStore VaultStore -RestoreLocation $vault.Location -RecoveryPoint $rp[0].Name -ItemLevelRecovery -RestoreType AlternateLocation -TargetResourceId $targetCrossSubStorageAccId -ContainersList $backedUpContainers[0,1]
133133

134134
$validateRestore = Test-AzDataProtectionBackupInstanceRestore -Name $instance[0].Name -ResourceGroupName $resourceGroupName -SubscriptionId $subId -VaultName $vaultName -RestoreRequest $restoreReqCSR

src/DataProtection/DataProtection.Autorest/test/DiskBackupScenario.Tests.ps1

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ Describe 'DiskBackupScenario' {
1515
It 'EndtoEndTest' {
1616
$vaultName = $env.TestDiskBackupScenario.VaultName
1717
$rgName = $env.TestDiskBackupScenario.ResourceGroupName
18-
$diskId = $env.TestDiskBackupScenario.DiskId
18+
$diskId = $env.TestDiskBackupScenario.DiskId
1919
$snapshotRg = $env.TestDiskBackupScenario.SnapshotRG
2020
$restoreDiskId = $env.TestDiskBackupScenario.RestoreDiskId
2121
$policyName = $env.TestDiskBackupScenario.NewPolicyName
@@ -25,7 +25,7 @@ Describe 'DiskBackupScenario' {
2525
$defaultPolicy = Get-AzDataProtectionPolicyTemplate -DatasourceType AzureDisk
2626
$policyId = "/subscriptions/" + $sub + "/resourceGroups/" + $rgName + "/providers/Microsoft.DataProtection/backupVaults/" + $vaultName + "/backupPolicies/" + $policyName
2727
$backupInstance = Initialize-AzDataProtectionBackupInstance -DatasourceType AzureDisk -DatasourceLocation centraluseuap -PolicyId $policyId -DatasourceId $diskId -SnapshotResourceGroupId $snapshotRg
28-
28+
2929
$instances = Get-AzDataProtectionBackupInstance -SubscriptionId $sub -ResourceGroupName $rgName -VaultName $vaultName
3030
$instance = $instances | where-Object {$_.Property.DataSourceInfo.ResourceId -eq $diskId}
3131
$backupInstanceName = $instance.Name
@@ -34,24 +34,24 @@ Describe 'DiskBackupScenario' {
3434
$protectionStatus = $instance.Property.ProtectionStatus.Status
3535
while($protectionStatus -ne "ProtectionConfigured")
3636
{
37-
Start-Sleep -Seconds 5
37+
Start-TestSleep -Seconds 5
3838

3939
$instance = Get-AzDataProtectionBackupInstance -SubscriptionId $sub -ResourceGroupName $rgName -VaultName $vaultName -Name $backupInstanceName
4040
$protectionStatus = $instance.Property.ProtectionStatus.Status
4141

4242
# configure backup if not configured
4343
}
4444

45-
$backupPolicyId = $instance.Property.PolicyInfo.PolicyId
45+
$backupPolicyId = $instance.Property.PolicyInfo.PolicyId
4646
$policy = Get-AzDataProtectionBackupPolicy -SubscriptionId $sub -VaultName $vaultName -ResourceGroupName $rgName | Where-Object { $_.Id -eq $backupPolicyId }
47-
47+
4848
$job = Backup-AzDataProtectionBackupInstanceAdhoc -SubscriptionId $sub -ResourceGroupName $rgName -VaultName $vaultName -BackupInstanceName $backupInstanceName -BackupRuleOptionRuleName $policy.Property.PolicyRule[0].Name -TriggerOptionRetentionTagOverride $policy.Property.PolicyRule[0].Trigger.TaggingCriterion[0].TagInfoTagName
4949

5050
$jobid = $job.JobId.Split("/")[-1]
5151
$jobstatus = "InProgress"
5252
while($jobstatus -ne "Completed")
5353
{
54-
Start-Sleep -Seconds 5
54+
Start-TestSleep -Seconds 5
5555
$currentjob = Get-AzDataProtectionJob -Id $jobid -SubscriptionId $sub -ResourceGroupName $rgName -VaultName $vaultName
5656
$jobstatus = $currentjob.Status
5757
}
@@ -64,7 +64,7 @@ Describe 'DiskBackupScenario' {
6464
$jobstatus = "InProgress"
6565
while($jobstatus -ne "Completed")
6666
{
67-
Start-Sleep -Seconds 5
67+
Start-TestSleep -Seconds 5
6868
$currentjob = Get-AzDataProtectionJob -Id $jobid -SubscriptionId $sub -ResourceGroupName $rgName -VaultName $vaultName
6969
$jobstatus = $currentjob.Status
7070
}

src/DataProtection/DataProtection.Autorest/test/Initialize-AzDataProtectionRestoreRequest.Tests.ps1

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,26 +16,26 @@ Describe 'Initialize-AzDataProtectionRestoreRequest' {
1616
$sub = $env.TestBlobsRestore.SubscriptionId
1717
$rgName = $env.TestBlobsRestore.ResourceGroupName
1818
$vaultName = $env.TestBlobsRestore.VaultName
19-
19+
2020
# $Debug preference = "Continue"
2121
Write-Debug -Message $sub
2222
Write-Debug -Message $rgName
2323
Write-Debug -Message $vaultName
2424

2525
$instances = Get-AzDataProtectionBackupInstance -Subscription $sub -ResourceGroup $rgName -Vault $vaultName | Where-Object {($_.Property.DataSourceInfo.Type -eq "Microsoft.Storage/storageAccounts/blobServices") -and ($_.Property.CurrentProtectionState -eq "ProtectionConfigured")}
26-
26+
2727
if($instances.Count -gt 0){
28-
28+
2929
$pointInTimeRange = Find-AzDataProtectionRestorableTimeRange -BackupInstanceName $instances[0].BackupInstanceName -ResourceGroupName $rgName -SubscriptionId $sub -VaultName $vaultName -SourceDataStoreType OperationalStore -StartTime (Get-Date).AddDays(-30).ToString("yyyy-MM-ddTHH:mm:ss.0000000Z") -EndTime (Get-Date).AddDays(0).ToString("yyyy-MM-ddTHH:mm:ss.0000000Z")
3030
$vault = Get-AzDataProtectionBackupVault -ResourceGroupName $rgName -SubscriptionId $sub -VaultName $vaultName
3131
$BlobResReq = Initialize-AzDataProtectionRestoreRequest -DatasourceType AzureBlob -SourceDataStore OperationalStore -RestoreLocation $vault.Location -RestoreType OriginalLocation -BackupInstance $instances[0] -PointInTime (Get-Date -Date $pointInTimeRange.RestorableTimeRange.EndTime)
3232

33-
$restoreJob = Start-AzDataProtectionBackupInstanceRestore -BackupInstanceName $instances[0].BackupInstanceName -ResourceGroupName $rgName -VaultName $vaultName -SubscriptionId $sub -Parameter $BlobResReq
33+
$restoreJob = Start-AzDataProtectionBackupInstanceRestore -BackupInstanceName $instances[0].BackupInstanceName -ResourceGroupName $rgName -VaultName $vaultName -SubscriptionId $sub -Parameter $BlobResReq
3434
$jobid = $restoreJob.JobId.Split("/")[-1]
3535
$jobstatus = "InProgress"
3636
while($jobstatus -ne "Completed")
3737
{
38-
Start-Sleep -Seconds 10
38+
Start-TestSleep -Seconds 10
3939
$currentjob = Get-AzDataProtectionJob -Id $jobid -SubscriptionId $sub -ResourceGroupName $rgName -VaultName $vaultName
4040
$jobstatus = $currentjob.Status
4141
}

0 commit comments

Comments
 (0)