From 670d5ff9f7965cccff29df82fdaacbd7d7762ab3 Mon Sep 17 00:00:00 2001 From: Yifan Zhang Date: Tue, 29 Oct 2024 16:14:51 +0800 Subject: [PATCH 1/2] update dataplane test --- src/Storage/RegressionTests/dataplane.ps1 | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/src/Storage/RegressionTests/dataplane.ps1 b/src/Storage/RegressionTests/dataplane.ps1 index ed6697e39f15..05ec3ab234ac 100644 --- a/src/Storage/RegressionTests/dataplane.ps1 +++ b/src/Storage/RegressionTests/dataplane.ps1 @@ -17,7 +17,7 @@ BeforeAll { #$cred = New-Object System.Management.Automation.PSCredential ($globalNode.applicationId, $secpasswd) #Add-AzAccount -ServicePrincipal -Tenant $globalNode.tenantId -SubscriptionId $globalNode.subscriptionId -Credential $cred - # COnnect-AzAccount + # Connect-AzAccount $ctxoauth1 = New-AzStorageContext -StorageAccountName $storageAccountName $ctxoauth2 = New-AzStorageContext -StorageAccountName $storageAccountName2 @@ -2563,6 +2563,27 @@ Describe "dataplane test" { $Error.Count | should -be 0 } + It "Upload file with write only SAS" { + $Error.Clear() + $sas = New-AzStorageAccountSASToken -Service File -ResourceType Container,Object,Service -Permission wc -ExpiryTime (Get-Date).AddDays(10) -Context $ctx + $ctxsas = New-AzStorageContext -StorageAccountName $storageAccountName -SasToken $sas + + New-AzStorageDirectory -ShareName $containerName -Path testdirx1 -Context $ctx + + $f = Set-AzStorageFileContent -ShareName $containerName -Source $localSmallSrcFile -Path testdirx1/file1. -Context $ctxsas -Force + $f = Get-AzStorageFile -ShareName $containerName -Path testdirx1/file1. -Context $ctx + $f.Name | Should -Be file1. + $Error.Count | Should -Be 0 + + $f = Set-AzStorageFileContent -ShareName $containerName -Source $localSmallSrcFile -Path testdirx1 -Context $ctxsas -Force -PassThru -ErrorAction SilentlyContinue + $error[0].Exception.Message + $Error.Clear() + + $f = Set-AzStorageFileContent -ShareName $containerName -Source $localSmallSrcFile -Path testdirx1/file1 -Context $ctxsas -Force -PassThru + $f = Get-AzStorageFile -ShareName $containerName -Path testdirx1/file1 -Context $ctx + $f.Name | Should -Be "file1" + $Error.Count | Should -Be 0 + } It "Test case name" { $Error.Clear() From 5d49b7ac2dbd7de34b45e81aaa36a3f944479420 Mon Sep 17 00:00:00 2001 From: Yifan Zhang Date: Fri, 1 Nov 2024 11:02:52 +0800 Subject: [PATCH 2/2] update adls and dataplane tests --- .../RegressionTests/adls_setaclresusive.ps1 | 14 +++++++------- src/Storage/RegressionTests/dataplane.ps1 | 7 +------ src/Storage/RegressionTests/runStable.ps1 | 2 +- 3 files changed, 9 insertions(+), 14 deletions(-) diff --git a/src/Storage/RegressionTests/adls_setaclresusive.ps1 b/src/Storage/RegressionTests/adls_setaclresusive.ps1 index fb15ef878037..e0574b9b3b7d 100644 --- a/src/Storage/RegressionTests/adls_setaclresusive.ps1 +++ b/src/Storage/RegressionTests/adls_setaclresusive.ps1 @@ -37,7 +37,7 @@ BeforeAll { [xml]$config = [xml]$config = Get-Content .\config.xml $globalNode = $config.SelectSingleNode("config/section[@id='global']") - $testNode = $config.SelectSingleNode("config/section[@id='adlsSetAcl']") + $testNode = $config.SelectSingleNode("config/section[@id='adls']") # Add-AzAccount @@ -253,7 +253,7 @@ Describe "Set DataLakeGen2 Acl Recursive" { $Error.Count | should -be 0 } - It "Set resume with ContinuationToken" { + It "Set resume with ContinuationToken" -Skip { $Error.Clear() ResetFileToFail @@ -274,7 +274,7 @@ Describe "Set DataLakeGen2 Acl Recursive" { $Error.Count | should -be 0 } - It "Update resume with ContinuationToken" { + It "Update resume with ContinuationToken" -SKip { $Error.Clear() ResetFileToFail @@ -293,7 +293,7 @@ Describe "Set DataLakeGen2 Acl Recursive" { $Error.Count | should -be 0 } - It "Remove resume with ContinuationToken" { + It "Remove resume with ContinuationToken" -SKip { $Error.Clear() ResetFileToFail @@ -312,7 +312,7 @@ Describe "Set DataLakeGen2 Acl Recursive" { $Error.Count | should -be 0 } - It "Set resume from failure by rerun set acl on the single failed files" { + It "Set resume from failure by rerun set acl on the single failed files" -SKip { $Error.Clear() ResetFileToFail @@ -343,7 +343,7 @@ Describe "Set DataLakeGen2 Acl Recursive" { $Error.Count | should -be 0 } - It "Update resume from failure by rerun set acl on the single failed files" { + It "Update resume from failure by rerun set acl on the single failed files" -SKip { $Error.Clear() ResetFileToFail @@ -374,7 +374,7 @@ Describe "Set DataLakeGen2 Acl Recursive" { $Error.Count | should -be 0 } - It "Remove resume from failure by rerun set acl on the single failed files" { + It "Remove resume from failure by rerun set acl on the single failed files" -SKip { $Error.Clear() ResetFileToFail diff --git a/src/Storage/RegressionTests/dataplane.ps1 b/src/Storage/RegressionTests/dataplane.ps1 index 05ec3ab234ac..9aa3181feac3 100644 --- a/src/Storage/RegressionTests/dataplane.ps1 +++ b/src/Storage/RegressionTests/dataplane.ps1 @@ -2414,8 +2414,6 @@ Describe "dataplane test" { $error.Clear() Remove-AzStorageShare -Name $shareName -Context $ctxkey -Force - Remove-AzStorageShare -Name $shareName -Context $ctxkey2 -Force - $Error.Count | should -be 0 } @@ -2579,10 +2577,7 @@ Describe "dataplane test" { $error[0].Exception.Message $Error.Clear() - $f = Set-AzStorageFileContent -ShareName $containerName -Source $localSmallSrcFile -Path testdirx1/file1 -Context $ctxsas -Force -PassThru - $f = Get-AzStorageFile -ShareName $containerName -Path testdirx1/file1 -Context $ctx - $f.Name | Should -Be "file1" - $Error.Count | Should -Be 0 + } It "Test case name" { diff --git a/src/Storage/RegressionTests/runStable.ps1 b/src/Storage/RegressionTests/runStable.ps1 index 4d27cab1a923..3efb7ea297fb 100644 --- a/src/Storage/RegressionTests/runStable.ps1 +++ b/src/Storage/RegressionTests/runStable.ps1 @@ -10,7 +10,7 @@ Import-Module $PSScriptRoot\utils.ps1 # $preview = $true -Invoke-Pester $PSScriptRoot\dataplane.ps1 -Show All -Strict # -TagFilter ToTest # -TagFilter blobversion,qq +Invoke-Pester $PSScriptRoot\dataplane.ps1 -Show All -Strict -ExcludeTagFilter "crossblobcopy" # -TagFilter ToTest # -TagFilter blobversion,qq Invoke-Pester $PSScriptRoot\adls.ps1 -Show All -Strict Invoke-Pester $PSScriptRoot\adls_setaclresusive.ps1 -Show All -Strict Invoke-Pester $PSScriptRoot\srp.ps1 -Show All -Strict -ExcludeTagFilter "longrunning" # -TagFilter "fail"