From 6b991f76443e52d4faae2b98f7ba015bbf4962dd Mon Sep 17 00:00:00 2001 From: Yifan Zhang Date: Wed, 31 Jul 2024 15:08:30 +0800 Subject: [PATCH] fix regression tests --- src/Storage/RegressionTests/adls.ps1 | 3 ++- src/Storage/RegressionTests/adls_setaclresusive.ps1 | 4 +--- src/Storage/RegressionTests/srp.ps1 | 6 ++++++ 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/src/Storage/RegressionTests/adls.ps1 b/src/Storage/RegressionTests/adls.ps1 index f9a17900528f..7b014b50aea7 100644 --- a/src/Storage/RegressionTests/adls.ps1 +++ b/src/Storage/RegressionTests/adls.ps1 @@ -15,7 +15,8 @@ BeforeAll { $rgname = $globalNode.resourceGroupName $accountName = $testNode.accountName - $ctx = (Get-AzStorageAccount -ResourceGroupName $rgname -Name $accountName).Context + $ctx = New-AzStorageContext -StorageAccountName $accountName + #$ctx = (Get-AzStorageAccount -ResourceGroupName $rgname -Name $accountName).Context $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 diff --git a/src/Storage/RegressionTests/adls_setaclresusive.ps1 b/src/Storage/RegressionTests/adls_setaclresusive.ps1 index a41da8a6de89..fb15ef878037 100644 --- a/src/Storage/RegressionTests/adls_setaclresusive.ps1 +++ b/src/Storage/RegressionTests/adls_setaclresusive.ps1 @@ -39,9 +39,7 @@ BeforeAll { $globalNode = $config.SelectSingleNode("config/section[@id='global']") $testNode = $config.SelectSingleNode("config/section[@id='adlsSetAcl']") - $secpasswd = ConvertTo-SecureString $globalNode.secPwd -AsPlainText -Force - $cred = New-Object System.Management.Automation.PSCredential ($globalNode.applicationId, $secpasswd) - Add-AzAccount -ServicePrincipal -Tenant $globalNode.tenantId -SubscriptionId $globalNode.subscriptionId -Credential $cred + # Add-AzAccount $resourceGroupName = $globalNode.resourceGroupName $storageAccountKey = (Get-AzStorageAccountKey -ResourceGroupName $resourceGroupName -Name $testNode.accountName)[0].Value diff --git a/src/Storage/RegressionTests/srp.ps1 b/src/Storage/RegressionTests/srp.ps1 index 6478d544cac8..87da04ce4b28 100644 --- a/src/Storage/RegressionTests/srp.ps1 +++ b/src/Storage/RegressionTests/srp.ps1 @@ -669,6 +669,12 @@ Describe "Management plan test" { $share.AccessTier | Should -Be "Cool" #$share = $share | Update-AzRmStorageShare -AccessTier TransactionOptimized #Assert-AreEqual "TransactionOptimized" $share.AccessTier + + $shares = Get-AzRmStorageShare -ResourceGroupName $rgname -StorageAccountName $accountNameLFS -Filter "startswith(name, test)" + $shares.Count | Should -Be 1 + $shares = Get-AzRmStorageShare -ResourceGroupName $rgname -StorageAccountName $accountNameLFS -Filter "startswith(name, something)" + $shares.Count | Should -Be 0 + Remove-AzRmStorageShare -ResourceGroupName $rgname -StorageAccountName $accountNameLFS -Name testsshare -Force