Merge pull request Azure#28 from wastoresh/testupdate

Update regression tests
yifanz7 · Feb 3, 2023 · b03208a · b03208a
2 parents e50dee2 + a102f8c
commit b03208a
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 14 deletions.
diff --git 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 = 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_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"
     $dirname2 = "dir2/"

diff --git 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
@@ -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 -AsJob
 
         $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
@@ -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']")