From bd62a25ede9f9f40659c026477fb9533f01bd59c Mon Sep 17 00:00:00 2001 From: Yifan Zhang Date: Fri, 3 Feb 2023 15:54:17 +0800 Subject: [PATCH 1/4] Fix regression tests --- src/Storage/RegressionTests/adls.ps1 | 12 ++++++------ src/Storage/RegressionTests/adls_setaclresusive.ps1 | 8 ++++---- src/Storage/RegressionTests/srp.ps1 | 4 ++-- src/Storage/RegressionTests/srp_preview.ps1 | 4 ++-- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/Storage/RegressionTests/adls.ps1 b/src/Storage/RegressionTests/adls.ps1 index 630ec2671867..22354510cff1 100644 --- a/src/Storage/RegressionTests/adls.ps1 +++ b/src/Storage/RegressionTests/adls.ps1 @@ -3,22 +3,22 @@ BeforeAll { # Modify the path to your own - Import-Module $PSScriptRoot\utils.ps1 + Import-Module .\utils.ps1 - [xml]$config = Get-Content D:\code\azure-powershell\src\Storage\RegressionTests\config.xml + [xml]$config = [xml]$config = Get-Content .\config.xml $globalNode = $config.SelectSingleNode("config/section[@id='global']") $testNode = $config.SelectSingleNode("config/section[@id='adls']") # Create the directory C:\temp locally before tests - $rootFolder = "C:\temp" - cd $rootFolder + #$rootFolder = "C:\temp" + #cd $rootFolder $rgname = $globalNode.resourceGroupName $accountName = $testNode.accountName $ctx = (Get-AzStorageAccount -ResourceGroupName $rgname -Name $accountName).Context - $localSrcFile = "C:\temp\testfile_1K_0" #The file need exist before test, and should be 512 bytes aligned - $localDestFile = "C:\temp\test1.txt" # test will create the file + $localSrcFile = ".\data\testfile_1024K_0" #The file need exist before test, and should be 512 bytes aligned + $localDestFile = ".\created\test1.txt" # test will create the file $filesystemName = "filesystem1" $dirname1 = "dir1" $dirname2 = "dir2/" diff --git a/src/Storage/RegressionTests/adls_setaclresusive.ps1 b/src/Storage/RegressionTests/adls_setaclresusive.ps1 index e099cfde188d..5931df640a63 100644 --- a/src/Storage/RegressionTests/adls_setaclresusive.ps1 +++ b/src/Storage/RegressionTests/adls_setaclresusive.ps1 @@ -33,9 +33,9 @@ function ResetFileToSuccess BeforeAll { # Modify the path to your own - Import-Module $PSScriptRoot\utils.ps1 + Import-Module .\utils.ps1 - [xml]$config = Get-Content D:\code\azure-powershell\src\Storage\RegressionTests\config.xml + [xml]$config = [xml]$config = Get-Content .\config.xml $globalNode = $config.SelectSingleNode("config/section[@id='global']") $testNode = $config.SelectSingleNode("config/section[@id='adlsSetAcl']") @@ -44,13 +44,13 @@ BeforeAll { Add-AzAccount -ServicePrincipal -Tenant $globalNode.tenantId -SubscriptionId $globalNode.subscriptionId -Credential $cred $resourceGroupName = $globalNode.resourceGroupName - $storageAccountKey = (Get-AzStorageAccountKey -ResourceGroupName $resourceGroupName -Name $testNode.accountName)[0].Value + $storageAccountKey = $testNode.accountKey $ctx = New-AzStorageContext $testNode.accountName -StorageAccountKey $storageAccountKey $ctx2 = New-AzStorageContext $testNode.accountName $filesystemName = "adlstest2" - $localSrcFile = "C:\temp\testfile_1K_0" #The file needs to exist before tests, and should be 512 bytes aligned + $localSrcFile = ".\data\testfile_1024K_0" #The file needs to exist before tests, and should be 512 bytes aligned $id = $globalNode.applicationId # for lease blob to make set acl recusive fail diff --git a/src/Storage/RegressionTests/srp.ps1 b/src/Storage/RegressionTests/srp.ps1 index 97e96b6c13d6..26e081182038 100644 --- a/src/Storage/RegressionTests/srp.ps1 +++ b/src/Storage/RegressionTests/srp.ps1 @@ -1222,7 +1222,7 @@ Describe "Management plan test" { $properties = Get-AzStorageBlobServiceProperty -ResourceGroupName $rgname -StorageAccountName $accountNamePITR $properties.RestorePolicy.Enabled | should -Be $false - Remove-AzStorageAccount -ResourceGroupName $globalNode.resourceGroupName -Name $accountNamePITR + Remove-AzStorageAccount -ResourceGroupName $globalNode.resourceGroupName -Name $accountNamePITR -Force $Error.Clear() $Error.Count | should -be 0 @@ -1233,7 +1233,7 @@ Describe "Management plan test" { $shareName1 = "test01" $shareName2 = "test02" - $accountNameSSD = $accountName + "sharesoftdel" + $accountNameSSD = $accountName + "sdel" New-AzStorageAccount -ResourceGroupName $rgname -Name $accountNameSSD -SkuName Standard_LRS -Location eastus diff --git a/src/Storage/RegressionTests/srp_preview.ps1 b/src/Storage/RegressionTests/srp_preview.ps1 index e15862977544..3992047a4ee3 100644 --- a/src/Storage/RegressionTests/srp_preview.ps1 +++ b/src/Storage/RegressionTests/srp_preview.ps1 @@ -1,9 +1,9 @@ # Invoke-Pester C:\Users\weiwei\Desktop\PSH_Script\PSHTest\dataplane.ps1 -Show All -Strict -ExcludeTagFilter "Preview" BeforeAll { - Import-Module D:\code\azure-powershell\src\Storage\RegressionTests\utils.ps1 + Import-Module .\utils.ps1 - [xml]$config = Get-Content D:\code\azure-powershell\src\Storage\RegressionTests\config.xml + [xml]$config = Get-Content .\config.xml $globalNode = $config.SelectSingleNode("config/section[@id='global']") $testNode = $config.SelectSingleNode("config/section[@id='srp']") From 4d28eee419e599fadd16243d35fb0769d1fb7448 Mon Sep 17 00:00:00 2001 From: Yifan Zhang Date: Fri, 3 Feb 2023 15:57:03 +0800 Subject: [PATCH 2/4] Add AsJob when deleting the Storage account in PITR test: --- src/Storage/RegressionTests/srp.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Storage/RegressionTests/srp.ps1 b/src/Storage/RegressionTests/srp.ps1 index 26e081182038..61c92d353baa 100644 --- a/src/Storage/RegressionTests/srp.ps1 +++ b/src/Storage/RegressionTests/srp.ps1 @@ -1222,7 +1222,7 @@ Describe "Management plan test" { $properties = Get-AzStorageBlobServiceProperty -ResourceGroupName $rgname -StorageAccountName $accountNamePITR $properties.RestorePolicy.Enabled | should -Be $false - Remove-AzStorageAccount -ResourceGroupName $globalNode.resourceGroupName -Name $accountNamePITR -Force + Remove-AzStorageAccount -ResourceGroupName $globalNode.resourceGroupName -Name $accountNamePITR -Force -AsJob $Error.Clear() $Error.Count | should -be 0 From 083ea6e7a5526049721d3c22bf4ac88e31b28206 Mon Sep 17 00:00:00 2001 From: Yifan Zhang Date: Fri, 3 Feb 2023 15:59:25 +0800 Subject: [PATCH 3/4] Fix typo --- src/Storage/RegressionTests/adls.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Storage/RegressionTests/adls.ps1 b/src/Storage/RegressionTests/adls.ps1 index 22354510cff1..d9a923e302f5 100644 --- a/src/Storage/RegressionTests/adls.ps1 +++ b/src/Storage/RegressionTests/adls.ps1 @@ -5,7 +5,7 @@ BeforeAll { # Modify the path to your own Import-Module .\utils.ps1 - [xml]$config = [xml]$config = Get-Content .\config.xml + [xml]$config = Get-Content .\config.xml $globalNode = $config.SelectSingleNode("config/section[@id='global']") $testNode = $config.SelectSingleNode("config/section[@id='adls']") From a102f8caa62990bbf1155e9633d8cf07223c2289 Mon Sep 17 00:00:00 2001 From: Yifan Zhang Date: Fri, 3 Feb 2023 16:11:15 +0800 Subject: [PATCH 4/4] Change file to 1K --- src/Storage/RegressionTests/adls.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Storage/RegressionTests/adls.ps1 b/src/Storage/RegressionTests/adls.ps1 index d9a923e302f5..13ccbdd09dbe 100644 --- a/src/Storage/RegressionTests/adls.ps1 +++ b/src/Storage/RegressionTests/adls.ps1 @@ -17,7 +17,7 @@ BeforeAll { $accountName = $testNode.accountName $ctx = (Get-AzStorageAccount -ResourceGroupName $rgname -Name $accountName).Context - $localSrcFile = ".\data\testfile_1024K_0" #The file need exist before test, and should be 512 bytes aligned + $localSrcFile = ".\data\testfile_1K_0" #The file need exist before test, and should be 512 bytes aligned $localDestFile = ".\created\test1.txt" # test will create the file $filesystemName = "filesystem1" $dirname1 = "dir1"