Skip to content

Commit d748a29

Browse files
committed
Update live test script on background jobs.
1 parent 50d20ac commit d748a29

File tree

3 files changed

+40
-42
lines changed

3 files changed

+40
-42
lines changed

.azure-pipelines/util/live-test-steps.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ jobs:
4747
New-Item -Name $(ArtifactsName) -Path $(Pipeline.Workspace) -ItemType Directory -Force
4848

4949
- task: DownloadPipelineArtifact@2
50-
condition: ${{ in(parameters.galleryName, 'DailyBuild', 'Sign') }}
50+
condition: and(ne(variables['skipLatest'], 'true'), ${{ in(parameters.galleryName, 'DailyBuild', 'Sign') }})
5151
displayName: Download artifacts from ${{ parameters.galleryName }}
5252
inputs:
5353
buildType: 'specific'

src/Storage/LiveTests/Storage.Management/FileTests.ps1

Lines changed: 38 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -8,29 +8,31 @@ Invoke-LiveTestScenario -Name "File basics" -Description "Test File basic operat
88
$testfile512path = "$PSScriptRoot\TestFiles\testfile512"
99
$localDestFile = "$PSScriptRoot\TestFiles\dest"
1010
$location = $rg.Location
11-
$account = New-AzStorageAccount -ResourceGroupName $rgName -Name $storageAccountName -Location $location -SkuName Standard_GRS -AllowSharedKeyAccess $true -Tag @{"Az.Sec.DisableAllowSharedKeyAccess::Skip" = "For Powershell test."}
12-
$ctx = $account.Context
11+
$account = New-AzStorageAccount -ResourceGroupName $rgName -Name $storageAccountName -Location $location -SkuName Standard_GRS -AllowSharedKeyAccess $true -Tag @{ "Az.Sec.DisableAllowSharedKeyAccess::Skip" = "For Powershell test." }
12+
$ctx = $account.Context
1313
$ctx1 = New-AzStorageContext -StorageAccountName $storageAccountName -StorageAccountKey (Get-AzStorageAccountKey -ResourceGroupName $rgName -Name $storageAccountName)[0].Value
1414

15-
$objectName1 = "filetest1.txt" # Removed the trailing dot temporarily to fix the case
16-
$objectName2 = "filetest2.txt"
15+
$objectName1 = "filetest1.txt" # Removed the trailing dot temporarily to fix the case
16+
$objectName2 = "filetest2.txt"
1717

18-
#Create a file share
18+
#Create a file share
1919
New-AzStorageShare $shareName -Context $ctx
2020
$Share = Get-AzStorageShare -Name $shareName -Context $ctx
2121
Assert-AreEqual $Share.Count 1
2222
Assert-AreEqual $Share[0].Name $shareName
2323

2424
# upload file
25-
$t = Set-AzStorageFileContent -source $testfile512path -ShareName $shareName -Path $objectName1 -Force -Context $ctx -asjob
26-
$t | wait-job
27-
Assert-AreEqual $t.State "Completed"
28-
Assert-AreEqual $t.Error $null
29-
30-
# upload/remove file/dir with -DisAllowTrailingDot
31-
$dirName1WithTrailingDot = "testdir1.."
32-
$dirName1WithOutTrailingDot = "testdir1"
33-
$objectPathWithoutTrailingDot = "testdir1/filetest1.txt"
25+
$t = Set-AzStorageFileContent -source $testfile512path -ShareName $shareName -Path $objectName1 -Force -Context $ctx -AsJob
26+
$t | Wait-Job
27+
$t | Receive-Job
28+
29+
Assert-AreEqual "Completed" $t.State
30+
Assert-Null $t.Error
31+
32+
# upload/remove file/dir with -DisAllowTrailingDot
33+
$dirName1WithTrailingDot = "testdir1.."
34+
$dirName1WithOutTrailingDot = "testdir1"
35+
$objectPathWithoutTrailingDot = "testdir1/filetest1.txt"
3436
New-AzStorageDirectory -ShareName $shareName -Path $dirName1WithTrailingDot -Context $ctx1 -DisAllowTrailingDot
3537
$file11 = Set-AzStorageFileContent -source $testfile512path -ShareName $shareName -Path "$($dirName1WithTrailingDot)/$($objectName1)" -Force -Context $ctx1 -DisAllowTrailingDot
3638
$file = Get-AzStorageFile -ShareName $shareName -Path $objectPathWithoutTrailingDot -Context $ctx1 -DisAllowTrailingDot
@@ -39,26 +41,23 @@ Invoke-LiveTestScenario -Name "File basics" -Description "Test File basic operat
3941
Remove-AzStorageFile -ShareName $shareName -Path "$($dirName1WithTrailingDot)/$($objectName1)" -Context $ctx1 -DisAllowTrailingDot
4042
Remove-AzStorageDirectory -ShareName $shareName -Path $dirName1WithTrailingDot -Context $ctx1 -DisAllowTrailingDot
4143

42-
# list file
44+
# list file
4345
$file = Get-AzStorageFile -ShareName $shareName -Context $ctx
4446
Assert-AreEqual $file.Count 1
4547
Assert-AreEqual $file[0].Name $objectName1
4648
Assert-NotNull $file[0].ListFileProperties.Properties.ETag
4749

48-
if ($Env:OS -eq "Windows_NT")
49-
{
50-
Set-AzStorageFileContent -source $testfile512path -ShareName $shareName -Path $objectName1 -PreserveSMBAttribute -Force -Context $ctx
50+
if ($Env:OS -eq "Windows_NT") {
51+
Set-AzStorageFileContent -source $testfile512path -ShareName $shareName -Path $objectName1 -PreserveSMBAttribute -Force -Context $ctx
5152
}
52-
else
53-
{
53+
else {
5454
Set-AzStorageFileContent -source $testfile512path -ShareName $shareName -Path $objectName1 -Force -Context $ctx
5555
}
56-
$file = Get-AzStorageFile -ShareName $shareName -Context $ctx
56+
$file = Get-AzStorageFile -ShareName $shareName -Context $ctx
5757
Assert-AreEqual $file.Count 1
5858
Assert-AreEqual $file[0].Name $objectName1
5959
Assert-NotNull $file[0].ListFileProperties.Properties.ETag
60-
if ($Env:OS -eq "Windows_NT")
61-
{
60+
if ($Env:OS -eq "Windows_NT") {
6261
$localFileProperties = Get-ItemProperty $testfile512path
6362
Assert-AreEqual $localFileProperties.CreationTime.ToUniversalTime().Ticks $file[0].ListFileProperties.Properties.CreatedOn.ToUniversalTime().Ticks
6463
Assert-AreEqual $localFileProperties.LastWriteTime.ToUniversalTime().Ticks $file[0].ListFileProperties.Properties.LastWrittenOn.ToUniversalTime().Ticks
@@ -72,23 +71,22 @@ Invoke-LiveTestScenario -Name "File basics" -Description "Test File basic operat
7271
Assert-AreEqual $file[0].Name $objectName1
7372
Assert-AreEqual $file[1].Name $objectName2
7473

75-
$t = Get-AzStorageFileContent -ShareName $shareName -Path $objectName1 -Destination $localDestFile -Force -Context $ctx -asjob
76-
$t | wait-job
77-
Assert-AreEqual $t.State "Completed"
78-
Assert-AreEqual $t.Error $null
74+
$t = Get-AzStorageFileContent -ShareName $shareName -Path $objectName1 -Destination $localDestFile -Force -Context $ctx -AsJob
75+
$t | Wait-Job
76+
$t | Receive-Job
77+
78+
Assert-AreEqual "Completed" $t.State
79+
Assert-Null $t.Error
7980
Assert-AreEqual (Get-FileHash -Path $localDestFile -Algorithm MD5).Hash (Get-FileHash -Path $testfile512path -Algorithm MD5).Hash
80-
81-
if ($Env:OS -eq "Windows_NT")
82-
{
81+
82+
if ($Env:OS -eq "Windows_NT") {
8383
Get-AzStorageFileContent -ShareName $shareName -Path $objectName1 -Destination $localDestFile -PreserveSMBAttribute -Force -Context $ctx1
8484
}
85-
else
86-
{
85+
else {
8786
Get-AzStorageFileContent -ShareName $shareName -Path $objectName1 -Destination $localDestFile -Force -Context $ctx
8887
}
8988
Assert-AreEqual (Get-FileHash -Path $localDestFile -Algorithm MD5).Hash (Get-FileHash -Path $testfile512path -Algorithm MD5).Hash
90-
if ($Env:OS -eq "Windows_NT")
91-
{
89+
if ($Env:OS -eq "Windows_NT") {
9290
$file = Get-AzStorageFile -ShareName $shareName -Path $objectName1 -Context $ctx1
9391
$localFileProperties = Get-ItemProperty $testfile512path
9492
Assert-AreEqual $localFileProperties.CreationTime.ToUniversalTime().Ticks $file[0].FileProperties.SmbProperties.FileCreatedOn.ToUniversalTime().Ticks
@@ -100,22 +98,22 @@ Invoke-LiveTestScenario -Name "File basics" -Description "Test File basic operat
10098
$file = Get-AzStorageFile -ShareName $shareName -Path $objectName1 -Context $ctx
10199

102100
$file2 = Rename-AzStorageFile -ShareName $shareName -SourcePath $objectName1 -DestinationPath $fileName1 -Context $ctx
103-
Assert-AreEqual $file2.Name $fileName1
101+
Assert-AreEqual $file2.Name $fileName1
104102
Assert-AreEqual $file.FileProperties.ContentType $file2.FileProperties.ContentType
105103
Assert-AreEqual $file.FileProperties.ContentLength $file2.FileProperties.ContentLength
106104

107105
$file3 = $file2 | Rename-AzStorageFile -DestinationPath $fileName1 -Context $ctx1 -Force
108-
Assert-AreEqual $file3.Name $fileName1
106+
Assert-AreEqual $file3.Name $fileName1
109107
Assert-AreEqual $file2.FileProperties.ContentType $file3.FileProperties.ContentType
110108
Assert-AreEqual $file2.FileProperties.ContentLength $file3.FileProperties.ContentLength
111-
109+
112110
Remove-AzStorageFile -ShareName $shareName -Path $fileName1 -Context $ctx
113111
$file = Get-AzStorageFile -ShareName $shareName -Context $ctx
114112
Assert-AreEqual $file.Count 1
115113
Assert-AreEqual $file[0].Name $objectName2
116114

117115
$dirName = "filetestdir"
118-
New-AzStorageDirectory -ShareName $shareName -Path $dirName -Context $ctx
116+
New-AzStorageDirectory -ShareName $shareName -Path $dirName -Context $ctx
119117
$file = Get-AzStorageShare -Name $shareName -Context $ctx1 | Get-AzStorageFile -ExcludeExtendedInfo
120118
Assert-AreEqual $file.Count 2
121119
Assert-AreEqual $file[0].Name $dirName
@@ -125,7 +123,7 @@ Invoke-LiveTestScenario -Name "File basics" -Description "Test File basic operat
125123
Assert-AreEqual $file[1].GetType().Name "AzureStorageFile"
126124
Assert-Null $file[1].ListFileProperties.Properties.ETag
127125

128-
$newDir = "new" + $dirName # + ".." Removed the trailing dots temporarily to fix the case
126+
$newDir = "new" + $dirName # + ".." Removed the trailing dots temporarily to fix the case
129127
$dir = Get-AzStorageFile -ShareName $shareName -Path $dirName -Context $ctx
130128
$dir2 = Rename-AzStorageDirectory -ShareName $shareName -SourcePath $dirName -DestinationPath $newDir -Context $ctx1
131129
Assert-AreEqual $newDir $dir2.Name
@@ -146,4 +144,4 @@ Invoke-LiveTestScenario -Name "File basics" -Description "Test File basic operat
146144

147145
# Clean Storage Account
148146
Remove-AzStorageShare -Name $shareName -Force -Context $ctx
149-
}
147+
}

tools/TestFx/Live/LiveTestUtility.psm1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -429,7 +429,7 @@ function Clear-LiveTestResources {
429429
param (
430430
[Parameter(Mandatory, Position = 0)]
431431
[ValidateNotNullOrEmpty()]
432-
[Alias("ResourceGroupname")]
432+
[Alias("ResourceGroupName")]
433433
[string] $Name
434434
)
435435

0 commit comments

Comments
 (0)