Skip to content

Commit 63e34d3

Browse files
authored
Fix live test job blocked issue and script issue (#25593)
1 parent 5c24d36 commit 63e34d3

File tree

3 files changed

+36
-41
lines changed

3 files changed

+36
-41
lines changed

src/Aks/Aks.Test/LiveTests/TestLiveScenarios.ps1

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ Invoke-LiveTestScenario -Name "Test_AKS_CURD" -Description "Test AKS Cluster CRU
88
$kubeClusterName = New-LiveTestResourceName
99

1010
# step 1: create a default aks cluster with default node pool
11-
1211
'y' | ssh-keygen -t rsa -f id_rsa -q -N '"123456"'
1312
$sshKeyValue = Get-Content id_rsa.pub -Raw
1413

@@ -66,8 +65,6 @@ Invoke-LiveTestScenario -Name "Test_AKS_CURD" -Description "Test AKS Cluster CRU
6665
Assert-Null $pools.PodSubnetID
6766
Assert-Null $pools.MaxCount
6867
Assert-Null $pools.MinCount
69-
Assert-Null $pools.EnableAutoScaling
70-
# Assert-Null $pools.UpgradeSettings
7168
Assert-Null $pools.EnableNodePublicIP
7269
Assert-Null $pools.ScaleSetPriority
7370
Assert-Null $pools.ScaleSetEvictionPolicy
@@ -149,5 +146,4 @@ Invoke-LiveTestScenario -Name "Test_AKS_CURD" -Description "Test AKS Cluster CRU
149146
Write-Host "##[section]Start to remove Aks cluster : Remove-AzAksCluster"
150147
$cluster | Remove-AzAksCluster -Force
151148
Write-Host "##[section]Finished removing Aks cluster : Remove-AzAksCluster"
152-
153149
}

src/Storage/Storage.Management.Test/LiveTests/BlobTests.ps1

Lines changed: 35 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -10,112 +10,111 @@ Invoke-LiveTestScenario -Name "Blob basics" -Description "Test blob basic operat
1010
$ContentMD5 = "i727sP7HigloQDsqadNLHw=="
1111
$testfile512path = "$PSScriptRoot\TestFiles\testfile512"
1212

13-
$account = New-AzStorageAccount -ResourceGroupName $rgName -Name $storageAccountName -Location $location -SkuName Standard_GRS -AllowBlobPublicAccess $true
14-
$ctx = $account.Context
15-
$container = New-AzStorageContainer -Name $containerName -Context $ctx
16-
$containerSAS = New-AzStorageContainerSASToken -Name $containerName -Permission radwl -ExpiryTime 5000-01-01 -Context $ctx
17-
$sasCtx = New-AzStorageContext -SasToken $containerSAS -StorageAccountName $storageAccountName
13+
$account = New-AzStorageAccount -ResourceGroupName $rgName -Name $storageAccountName -Location $location -SkuName Standard_GRS
14+
$ctx = $account.Context
15+
$container = New-AzStorageContainer -Name $containerName -Context $ctx
16+
$containerSAS = New-AzStorageContainerSASToken -Name $containerName -Permission radwl -ExpiryTime 5000-01-01 -Context $ctx
17+
$sasCtx = New-AzStorageContext -SasToken $containerSAS -StorageAccountName $storageAccountName
1818

1919
# container ACL and stored access policy
2020
$accessPolicyName = "policy1"
2121
New-AzStorageContainerStoredAccessPolicy -Container $containerName -Policy $accessPolicyName -Context $ctx -Permission rw
22-
$accessPolicy = Get-AzStorageContainerStoredAccessPolicy -Container $containerName -Context $ctx
22+
$accessPolicy = Get-AzStorageContainerStoredAccessPolicy -Container $containerName -Context $ctx
2323
Assert-AreNotEqual $null $accessPolicy
2424
Assert-AreEqual $accessPolicyName $accessPolicy.Policy
25-
Set-AzStorageContainerAcl -Name $containerName -Permission Blob -Context $ctx
26-
$container = Get-AzStorageContainer -Name $containerName -Context $ctx
25+
Set-AzStorageContainerAcl -Name $containerName -Permission Blob -Context $ctx
26+
$container = Get-AzStorageContainer -Name $containerName -Context $ctx
2727
Assert-AreEqual "Blob" $container.Permission.PublicAccess
2828

29-
# upload
30-
$blobName = New-LiveTestResourceName
29+
# upload
30+
$blobName = New-LiveTestResourceName
3131
$blobName2 = New-LiveTestResourceName
3232
$blobName3 = "blob3" + $blobName
33-
$b = Set-AzStorageBlobContent -File $testfile512path -Container $containerName -Blob $blobName -StandardBlobTier Cool -Properties @{"ContentType" = $ContentType; "ContentMD5" = $ContentMD5} -Context $ctx -Force
34-
Assert-AreEqual $blobName $b.Name
33+
$b = Set-AzStorageBlobContent -File $testfile512path -Container $containerName -Blob $blobName -StandardBlobTier Cool -Properties @{"ContentType" = $ContentType; "ContentMD5" = $ContentMD5 } -Context $ctx -Force
34+
Assert-AreEqual $blobName $b.Name
3535
Assert-AreEqual 512 $b.Length
3636
Assert-AreEqual $ContentType $b.BlobProperties.ContentType
3737
Assert-AreEqual "Cool" $b.BlobProperties.AccessTier
38-
$blobs = Get-AzStorageBlob -Container $containerName -Context $ctx
38+
$blobs = Get-AzStorageBlob -Container $containerName -Context $ctx
3939
Assert-AreEqual 1 $blobs.Count
4040
Assert-AreEqual $blobName $blobs[0].Name
4141
Assert-AreEqual $ContentType $blobs[0].BlobProperties.ContentType
4242
Assert-AreEqual "Cool" $blobs[0].BlobProperties.AccessTier
4343

4444
$blob = Get-AzStorageBlob -Container $containerName -Blob $blobName -Context $sasCtx
45-
Assert-AreEqual $blobName $blob.Name
46-
Assert-AreEqual 512 $blob.Length
45+
Assert-AreEqual $blobName $blob.Name
46+
Assert-AreEqual 512 $blob.Length
4747
Assert-AreEqual $ContentType $blob.BlobProperties.ContentType
48-
48+
4949
$b.BlobBaseClient.SetAccessTier("Hot")
5050
$b.FetchAttributes()
5151
Assert-AreEqual "Hot" $b.BlobProperties.AccessTier
5252

5353
$b2 = Set-AzStorageBlobContent -File $testfile512path -Container $containerName -Blob $blobName2 -Force -Context $ctx
54-
$blobs = Get-AzStorageBlob -Container $containerName -Context $ctx
54+
$blobs = Get-AzStorageBlob -Container $containerName -Context $ctx
5555
Assert-AreEqual 2 $blobs.Count
5656
$b3 = Set-AzStorageBlobContent -File $testfile512path -Container $containerName -Blob $blobName3 -Force -Context $sasCtx
5757
$b2.BlobBaseClient.CreateSnapshot()
5858

59-
$blobs = Get-AzStorageBlob -Container $containerName -Prefix "blob3" -Context $ctx
59+
$blobs = Get-AzStorageBlob -Container $containerName -Prefix "blob3" -Context $ctx
6060
Assert-AreEqual 1 $blobs.Count
6161
Assert-AreEqual $blobName3 $blobs[0].Name
6262

6363
$blobs = Get-AzStorageBlob -Container $containerName -Context $ctx
64-
$snapshotblob = $blobs | ?{$_.SnapshotTime -ne $null} | Select-Object -First 1
65-
$blob = Get-AzStorageBlob -Container $containerName -Blob $blobName2 -SnapshotTime $snapshotblob.SnapshotTime -Context $ctx
66-
Assert-AreEqual $blobName2 $blob.Name
64+
$snapshotblob = $blobs | ? { $_.SnapshotTime -ne $null } | Select-Object -First 1
65+
$blob = Get-AzStorageBlob -Container $containerName -Blob $blobName2 -SnapshotTime $snapshotblob.SnapshotTime -Context $ctx
66+
Assert-AreEqual $blobName2 $blob.Name
6767
Assert-AreEqual $snapshotblob.SnapshotTime $blob.SnapshotTime
6868

69-
$blob = Set-AzStorageBlobContent -File $testfile512path -Container $containerName -Blob $blobName3 -Tag @{"Tag1"="Value2";"Tag2"="Value2"} -Context $ctx -Force
70-
$blob = Get-AzStorageBlob -Blob $blobName3 -Container $containerName -IncludeTag -Context $ctx
71-
Assert-AreEqual $blobName3 $blob.Name
69+
$blob = Set-AzStorageBlobContent -File $testfile512path -Container $containerName -Blob $blobName3 -Tag @{"Tag1" = "Value2"; "Tag2" = "Value2" } -Context $ctx -Force
70+
$blob = Get-AzStorageBlob -Blob $blobName3 -Container $containerName -IncludeTag -Context $ctx
71+
Assert-AreEqual $blobName3 $blob.Name
7272
Assert-AreEqual 2 $blob.TagCount
7373
Assert-AreEqual 2 $blob.Tags.Count
7474

7575
Update-AzStorageBlobServiceProperty -ResourceGroupName $rgName -StorageAccountName $storageAccountName -IsVersioningEnabled $true
7676
sleep 30
7777
$blob = Set-AzStorageBlobContent -File $testfile512path -Container $containerName -Blob $blobName3 -Context $sasctx -Force
7878
$blobs = Get-AzStorageBlob -Container $containerName -Context $ctx -IncludeVersion
79-
$versionBlob = $blobs | ?{$_.VersionId -ne $null} | Select-Object -First 1
80-
$blob = Get-AzStorageBlob -Container $containerName -Blob $blobName3 -VersionId $versionBlob.VersionId -Context $ctx
79+
$versionBlob = $blobs | ? { $_.VersionId -ne $null } | Select-Object -First 1
80+
$blob = Get-AzStorageBlob -Container $containerName -Blob $blobName3 -VersionId $versionBlob.VersionId -Context $ctx
8181
Assert-AreEqual $blobName3 $blob.Name
8282
Assert-AreEqual $versionBlob.VersionId $blob.VersionId
8383

84-
$b2 | Remove-AzStorageBlob -Force
85-
$blobs = Get-AzStorageBlob -Container $containerName -Context $ctx
84+
$b2 | Remove-AzStorageBlob -Force
85+
$blobs = Get-AzStorageBlob -Container $containerName -Context $ctx
8686
Assert-AreEqual 2 $blobs.Count
8787

8888
$container = Get-AzStorageContainer -Name $containerName -Context $ctx
8989
$containerProperties = $container.BlobContainerClient.GetProperties().Value
9090
Assert-AreEqual $container.BlobContainerProperties.ETag $containerProperties.ETag
91-
Set-AzStorageContainerAcl -Name $containerName -Permission Blob -Context $ctx
91+
Set-AzStorageContainerAcl -Name $containerName -Permission Blob -Context $ctx
9292
$containerProperties = $container.BlobContainerClient.GetProperties().Value
9393
Assert-AreNotEqual $container.BlobContainerProperties.ETag $containerProperties.ETag
9494
$container.FetchAttributes()
9595
Assert-AreEqual $container.BlobContainerProperties.ETag $containerProperties.ETag
9696

97-
# sync copy
97+
# sync copy
9898
$copyBlobName1 = New-LiveTestResourceName
9999
$copyBlobName2 = New-LiveTestResourceName
100100
$b = Copy-AzStorageBlob -SrcContainer $containerName -SrcBlob $blobName -DestContainer $containerName -DestBlob $copyBlobName1 -Context $ctx -StandardBlobTier Hot -RehydratePriority High -Force
101101
Assert-AreEqual $copyBlobName1 $b.Name
102102
Assert-AreEqual "Hot" $b.AccessTier
103103
Assert-AreEqual 512 $b.Length
104104
$job = Copy-AzStorageBlob -SrcContainer $containerName -SrcBlob $blobName -DestContainer $containerName -DestBlob $copyBlobName1 -Context $ctx -StandardBlobTier Hot -RehydratePriority High -Force -AsJob
105-
Wait-Job $job
106-
$bcopy = Receive-Job -Job $job
105+
$bcopy = Receive-Job -Job $job -Wait -AutoRemoveJob
107106
Assert-AreEqual $copyBlobName1 $bcopy.Name
108107

109108
$blobSASUri = $b | New-AzStorageBlobSASToken -Permission rt -ExpiryTime 9999-01-01 -FullUri
110109
$b2 = Copy-AzStorageBlob -AbsoluteUri $blobSASUri -DestContainer $containerName -DestBlob $copyBlobName2 -Context $ctx -Force
111110
Assert-AreEqual $copyBlobName2 $b2.Name
112111
Assert-AreEqual 512 $b2.Length
113112

114-
# async copy
113+
# async copy
115114
Start-AzStorageBlobCopy -SrcContainer $containerName -SrcBlob $blobName -DestContainer $containerName -DestBlob $copyBlobName1 -StandardBlobTier Cool -RehydratePriority High -Context $ctx -DestContext $ctx -Force
116-
Get-AzStorageBlobCopyState -Container $containerName -Blob $copyBlobName1 -Context $ctx
117-
sleep 5
115+
Get-AzStorageBlobCopyState -Container $containerName -Blob $copyBlobName1 -Context $ctx
116+
sleep 5
118117
$b = Get-AzStorageBlob -Blob $copyBlobName1 -Container $containerName -Context $ctx
119118
Assert-AreEqual $copyBlobName1 $b.Name
120119
Assert-AreEqual "Cool" $b.AccessTier
121-
}
120+
}

tools/TestFx/Live/LiveTestUtility.psm1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -302,7 +302,7 @@ function Invoke-LiveTestScenario {
302302

303303
do {
304304
try {
305-
$prefs = @([psvariable]::new("ErrorActionPreference", "Stop"), [psvariable]::new("ConfirmPreference", "None"))
305+
$prefs = @([psvariable]::new("ErrorActionPreference", "Stop"))
306306
if ($snrRetryCount -eq $script:ScenarioMaxRetryCount) {
307307
$prefs += [psvariable]::new("DebugPreference", "Continue")
308308
}

0 commit comments

Comments
 (0)