Skip to content

Commit 6c7b86e

Browse files
yifanz7yifanz7
authored
Merge pull request Azure#38 from yifanz7/addtests
update regression tests
2 parents 93ab3f4 + ba02192 commit 6c7b86e

File tree

3 files changed

+61
-54
lines changed

3 files changed

+61
-54
lines changed

‎src/Storage/RegressionTests/adls.ps1

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -206,9 +206,9 @@ Describe "dataplane test" {
206206
$sasrd = New-AzStorageContainerSASToken -Name $filesystemName -Permission rd -Context $ctx
207207
$sasctxrd = New-AzStorageContext -StorageAccountName $ctx.StorageAccountName -SasToken $sasrd
208208
$sasw = New-AzStorageContainerSASToken -Name $filesystemName -Permission w -Context $ctx
209-
$dir3 = Move-AzDataLakeGen2Item -Context $sasctxrd -FileSystem $filesystemName -Path $dirname1 -DestFileSystem $filesystemName -DestPath "$($dirname3)$($sasw)" -Force
209+
$dir3 = Move-AzDataLakeGen2Item -Context $sasctxrd -FileSystem $filesystemName -Path $dirname1 -DestFileSystem $filesystemName -DestPath "$($dirname3)?$($sasw)" -Force
210210
$dir3
211-
$dir1 = Move-AzDataLakeGen2Item -Context $sasctxrd -FileSystem $filesystemName -Path $dirname3 -DestFileSystem $filesystemName -DestPath "$($dirname1)$($sasw)"
211+
$dir1 = Move-AzDataLakeGen2Item -Context $sasctxrd -FileSystem $filesystemName -Path $dirname3 -DestFileSystem $filesystemName -DestPath "$($dirname1)?$($sasw)"
212212
$dir1
213213

214214
## move file, then move back with pipeline

‎src/Storage/RegressionTests/dataplane.ps1

Lines changed: 50 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,11 @@ BeforeAll {
1313
$storageAccountName2 = $testNode.SelectSingleNode("accountName[@id='2']").'#text'
1414

1515
# create oauth context
16-
$secpasswd = ConvertTo-SecureString $globalNode.secPwd -AsPlainText -Force
17-
$cred = New-Object System.Management.Automation.PSCredential ($globalNode.applicationId, $secpasswd)
18-
Add-AzAccount -ServicePrincipal -Tenant $globalNode.tenantId -SubscriptionId $globalNode.subscriptionId -Credential $cred
16+
#$secpasswd = ConvertTo-SecureString $globalNode.secPwd -AsPlainText -Force
17+
#$cred = New-Object System.Management.Automation.PSCredential ($globalNode.applicationId, $secpasswd)
18+
#Add-AzAccount -ServicePrincipal -Tenant $globalNode.tenantId -SubscriptionId $globalNode.subscriptionId -Credential $cred
19+
20+
COnnect-AzAccount
1921
$ctxoauth1 = New-AzStorageContext -StorageAccountName $storageAccountName
2022
$ctxoauth2 = New-AzStorageContext -StorageAccountName $storageAccountName2
2123

@@ -272,6 +274,7 @@ Describe "dataplane test" {
272274
It "Set-AzStorageContainerAcl won't clean up the stored Access Policy" -Tag "accesspolicy" {
273275
$Error.Clear()
274276

277+
Set-AzStorageAccount -ResourceGroupName $resourceGroupName -Name $storageAccountName -AllowBlobPublicAccess $true
275278
## regression test for Fix Set-AzStorageContainerAcl can clean up the stored Access Policy
276279
New-AzStorageContainerStoredAccessPolicy -Container $containerName -Policy 123 -Permission rw -Context $ctx
277280
New-AzStorageContainerStoredAccessPolicy -Container $containerName -Policy 234 -Permission rwdl -Context $ctx
@@ -290,6 +293,8 @@ Describe "dataplane test" {
290293
$sas = New-AzStorageContainerSASToken -Name $ContainerName -Policy 123 -StartTime (Get-Date) -ExpiryTime (Get-Date).AddDays(1) -Context $ctx
291294
$sas.Length | should -BeGreaterThan 10
292295

296+
Set-AzStorageAccount -ResourceGroupName $resourceGroupName -Name $storageAccountName -AllowBlobPublicAccess $false
297+
293298
$Error.Count | should -be 0
294299
}
295300

@@ -536,10 +541,10 @@ Describe "dataplane test" {
536541
New-AzStorageQueue -Name $containerName -Context $ctx
537542
Get-AzStorageQueue -Context $ctx
538543
$queue = Get-AzStorageQueue -Name $containerName -Context $ctx
539-
$queueMessage = New-Object -TypeName "Microsoft.Azure.Storage.Queue.CloudQueueMessage,$($queue.CloudQueue.GetType().Assembly.FullName)" -ArgumentList "This is message 1"
540-
$queue.CloudQueue.AddMessageAsync($QueueMessage)
541-
$queueMessage = New-Object -TypeName "Microsoft.Azure.Storage.Queue.CloudQueueMessage" -ArgumentList "This is message 2"
542-
$queue.CloudQueue.AddMessageAsync($QueueMessage)
544+
$queueMessage = "This is message 1"
545+
$queue.QueueClient.SendMessage($QueueMessage)
546+
$queueMessage = "This is message 2"
547+
$queue.QueueClient.SendMessage($QueueMessage)
543548
Remove-AzStorageQueue -Name $containerName -Force -Context $ctx
544549
Get-AzStorageQueue -Context $ctx
545550
$Error.Count | should -be 0
@@ -728,15 +733,17 @@ Describe "dataplane test" {
728733
$Error.Clear()
729734

730735
## Encryption Scope
731-
$secpasswd = ConvertTo-SecureString $globalNode.secPwd -AsPlainText -Force
732-
$cred = New-Object System.Management.Automation.PSCredential ($globalNode.applicationId, $secpasswd)
733-
Add-AzAccount -ServicePrincipal -Tenant $globalNode.tenantId -SubscriptionId $globalNode.subscriptionId -Credential $cred
736+
#$secpasswd = ConvertTo-SecureString $globalNode.secPwd -AsPlainText -Force
737+
#$cred = New-Object System.Management.Automation.PSCredential ($globalNode.applicationId, $secpasswd)
738+
#Add-AzAccount -ServicePrincipal -Tenant $globalNode.tenantId -SubscriptionId $globalNode.subscriptionId -Credential $cred
734739

735740
$scopeName1 = "testscope"
736741
$scopeName2 = "testscope2"
737742
$md5 = New-Object -TypeName System.Security.Cryptography.MD5CryptoServiceProvider
738743
New-AzStorageEncryptionScope -ResourceGroupName $resourceGroupName -StorageAccountName $storageAccountName -EncryptionScopeName $scopeName1 -StorageEncryption
739744
New-AzStorageEncryptionScope -ResourceGroupName $resourceGroupName -StorageAccountName $storageAccountName -EncryptionScopeName $scopeName2 -StorageEncryption
745+
Set-AzStorageAccount -ResourceGroupName $resourceGroupName -Name $storageAccountName -AllowBlobPublicAccess $true
746+
sleep 10
740747
try{
741748

742749
$containerName_es = $containerName + "es"
@@ -768,6 +775,7 @@ Describe "dataplane test" {
768775
throw;
769776
}
770777

778+
Set-AzStorageAccount -ResourceGroupName $resourceGroupName -Name $storageAccountName -AllowBlobPublicAccess $false
771779

772780
Remove-AzStorageContainer $containerName_es -Context $ctx -Force
773781
$Error.Count | should -be 0
@@ -1085,39 +1093,39 @@ Describe "dataplane test" {
10851093

10861094
$rgname = $globalNode.resourceGroupName
10871095
$accountName = $testNode.SelectSingleNode("accountName[@id='3']").'#text'
1088-
$ctx = (Get-AzStorageAccount -ResourceGroupName $rgname -Name $accountName).Context
1096+
$ctxhns = (Get-AzStorageAccount -ResourceGroupName $rgname -Name $accountName).Context
10891097

10901098
$localSrcFile = ".\data\testfile_1K_0"
10911099
$filesystemName = "retestsoftdelete"
10921100

10931101
# enable soft delete (on blob, also on hns)
1094-
Enable-AzStorageDeleteRetentionPolicy -RetentionDays 1 -Context $ctx
1102+
Enable-AzStorageDeleteRetentionPolicy -RetentionDays 1 -Context $ctxhns
10951103

10961104
# create file system and items
1097-
New-AzDatalakeGen2FileSystem -Name $filesystemName -Context $ctx
1098-
New-AzDataLakeGen2Item -Context $ctx -FileSystem $filesystemName -Directory -Path dir0
1099-
New-AzDataLakeGen2Item -Context $ctx -FileSystem $filesystemName -Directory -Path dir0/dir0
1100-
New-AzDataLakeGen2Item -Context $ctx -FileSystem $filesystemName -Directory -Path dir0/dir1
1101-
New-AzDataLakeGen2Item -Context $ctx -FileSystem $filesystemName -Directory -Path dir0/dir2
1102-
New-AzDataLakeGen2Item -Context $ctx -FileSystem $filesystemName -Path dir0/dir1/file1 -Source $localSrcFile -Force
1103-
New-AzDataLakeGen2Item -Context $ctx -FileSystem $filesystemName -Path dir0/dir1/file2 -Source $localSrcFile -Force
1104-
New-AzDataLakeGen2Item -Context $ctx -FileSystem $filesystemName -Path dir0/dir2/file3 -Source $localSrcFile -Force
1105-
New-AzDataLakeGen2Item -Context $ctx -FileSystem $filesystemName -Path dir0/dir2/file4 -Source $localSrcFile -Force
1106-
1107-
$items = Get-AzDataLakeGen2ChildItem -Context $ctx -FileSystem $filesystemName -Recurse
1105+
New-AzDatalakeGen2FileSystem -Name $filesystemName -Context $ctxhns
1106+
New-AzDataLakeGen2Item -Context $ctxhns -FileSystem $filesystemName -Directory -Path dir0
1107+
New-AzDataLakeGen2Item -Context $ctxhns -FileSystem $filesystemName -Directory -Path dir0/dir0
1108+
New-AzDataLakeGen2Item -Context $ctxhns -FileSystem $filesystemName -Directory -Path dir0/dir1
1109+
New-AzDataLakeGen2Item -Context $ctxhns -FileSystem $filesystemName -Directory -Path dir0/dir2
1110+
New-AzDataLakeGen2Item -Context $ctxhns -FileSystem $filesystemName -Path dir0/dir1/file1 -Source $localSrcFile -Force
1111+
New-AzDataLakeGen2Item -Context $ctxhns -FileSystem $filesystemName -Path dir0/dir1/file2 -Source $localSrcFile -Force
1112+
New-AzDataLakeGen2Item -Context $ctxhns -FileSystem $filesystemName -Path dir0/dir2/file3 -Source $localSrcFile -Force
1113+
New-AzDataLakeGen2Item -Context $ctxhns -FileSystem $filesystemName -Path dir0/dir2/file4 -Source $localSrcFile -Force
1114+
1115+
$items = Get-AzDataLakeGen2ChildItem -Context $ctxhns -FileSystem $filesystemName -Recurse
11081116
$items.Count | should -be 8
11091117

1110-
Remove-AzDataLakeGen2Item -Context $ctx -FileSystem $filesystemName -Force -Path dir0/dir1/file1
1111-
Remove-AzDataLakeGen2Item -Context $ctx -FileSystem $filesystemName -Force -Path dir0/dir2/file3
1112-
Remove-AzDataLakeGen2Item -Context $ctx -FileSystem $filesystemName -Force -Path dir0/dir2
1118+
Remove-AzDataLakeGen2Item -Context $ctxhns -FileSystem $filesystemName -Force -Path dir0/dir1/file1
1119+
Remove-AzDataLakeGen2Item -Context $ctxhns -FileSystem $filesystemName -Force -Path dir0/dir2/file3
1120+
Remove-AzDataLakeGen2Item -Context $ctxhns -FileSystem $filesystemName -Force -Path dir0/dir2
11131121

1114-
$items = Get-AzDataLakeGen2ChildItem -Context $ctx -FileSystem $filesystemName -Recurse
1122+
$items = Get-AzDataLakeGen2ChildItem -Context $ctxhns -FileSystem $filesystemName -Recurse
11151123
$items.Count | should -be 4
11161124

1117-
$items = Get-AzDataLakeGen2DeletedItem -Context $ctx -FileSystem $filesystemName -Path dir0/dir2
1125+
$items = Get-AzDataLakeGen2DeletedItem -Context $ctxhns -FileSystem $filesystemName -Path dir0/dir2
11181126
$items.Count | should -be 2
11191127

1120-
$items = Get-AzDataLakeGen2DeletedItem -Context $ctx -FileSystem $filesystemName
1128+
$items = Get-AzDataLakeGen2DeletedItem -Context $ctxhns -FileSystem $filesystemName
11211129
$items.Count | should -be 3
11221130

11231131
# item[0] should be dir0/dir1/file1
@@ -1126,17 +1134,17 @@ Describe "dataplane test" {
11261134
$items0.File.Exists() | should -be $true
11271135

11281136
# item[1] should be dir0/dir2
1129-
$items1 = Restore-AzDataLakeGen2DeletedItem -Context $ctx -FileSystem $filesystemName -Path $items[1].Path -DeletionId $items[1].DeletionId
1137+
$items1 = Restore-AzDataLakeGen2DeletedItem -Context $ctxhns -FileSystem $filesystemName -Path $items[1].Path -DeletionId $items[1].DeletionId
11301138
$items1.Path | should -be $items[1].Path
11311139
$items1.Directory.Exists() | should -be $true
11321140

1133-
$items = Get-AzDataLakeGen2DeletedItem -Context $ctx -FileSystem $filesystemName
1141+
$items = Get-AzDataLakeGen2DeletedItem -Context $ctxhns -FileSystem $filesystemName
11341142
$items.Count | should -be 1
11351143

1136-
$items = Get-AzDataLakeGen2ChildItem -Context $ctx -FileSystem $filesystemName -Recurse
1144+
$items = Get-AzDataLakeGen2ChildItem -Context $ctxhns -FileSystem $filesystemName -Recurse
11371145
$items.Count | should -be 7
11381146

1139-
Remove-AzDatalakeGen2FileSystem -Name $filesystemName -Context $ctx -Force
1147+
Remove-AzDatalakeGen2FileSystem -Name $filesystemName -Context $ctxhns -Force
11401148

11411149
$Error.Count | should -be 0
11421150
}
@@ -1936,7 +1944,7 @@ Describe "dataplane test" {
19361944
$containername1 = GetRandomContainerName + "cold"
19371945
New-AzStorageContainer -Name $containername1 -Context $ctx
19381946

1939-
$blob = Set-AzStorageBlobContent -Container $containername1 -File $localSmallSrcFile -Blob test1 -StandardBlobTier Cold -Properties @{"ContentType" = "image/jpeg"} -Metadata @{"tag1" = "value1"} -Context $ctx
1947+
$blob = Set-AzStorageBlobContent -Container $containername1 -File $localSmallSrcFile -Blob test1 -StandardBlobTier Cold -Properties @{"ContentType" = "image/jpeg"} -Metadata @{"tag1" = "value1"} -Context $ctx -Force
19401948
$blob.Name | Should -Be "test1"
19411949
$blob.AccessTier | Should -Be "Cold"
19421950
$blob.BlobProperties.ContentType | Should -Be "image/jpeg"
@@ -1997,13 +2005,12 @@ Describe "dataplane test" {
19972005
$qs.Count | Should -BeGreaterOrEqual 2
19982006

19992007
$q = Get-AzStorageQueue -Name $queuename -Context $ctx
2000-
$queueMessage = New-Object -TypeName "Microsoft.Azure.Storage.Queue.CloudQueueMessage,$($q.CloudQueue.GetType().Assembly.FullName)" -ArgumentList "This is message 1"
2001-
$q.CloudQueue.AddMessageAsync($QueueMessage)
2008+
$queueMessage = "This is message 1"
2009+
$q.QueueClient.SendMessage($QueueMessage)
20022010
$q = Get-AzStorageQueue -Name $queuename -Context $ctxoauth1
20032011
$q.Name | Should -Be $queuename
20042012
$q.ApproximateMessageCount | Should -Be 1
20052013
$q.QueueProperties.ApproximateMessagesCount | Should -Be 1
2006-
$q.CloudQueue.ApproximateMessageCount | Should -Be 1
20072014

20082015
$sas = New-AzStorageAccountSASToken -Service Queue -ResourceType Container,Object,Service -Permission rwdl -ExpiryTime 3000-01-01 -Context $ctx
20092016
$ctxaccountsas = New-AzStorageContext -StorageAccountName $storageAccountName -SasToken $sas
@@ -2071,6 +2078,7 @@ Describe "dataplane test" {
20712078

20722079
$localSrcFile = ".\data\testfile_1K_0"
20732080
$localSrcFileName = "testfile_1K_0"
2081+
$localLargeSrcFile = ".\data\testfile_307200K_0" # File of size 300M. Needs to be created beforehand
20742082
$localDestFile = ".\created\testoauth" # test will create the file
20752083
$localDestFileName = "testoauth"
20762084
$shareName = "sharefileoauth"
@@ -2079,9 +2087,9 @@ Describe "dataplane test" {
20792087
$filepath = "dir1\test1"
20802088

20812089
# create oauth context
2082-
$secpasswd = ConvertTo-SecureString $globalNode.secPwd -AsPlainText -Force
2083-
$cred = New-Object System.Management.Automation.PSCredential ($globalNode.applicationId, $secpasswd)
2084-
Add-AzAccount -ServicePrincipal -Tenant $globalNode.tenantId -SubscriptionId $globalNode.subscriptionId -Credential $cred
2090+
#$secpasswd = ConvertTo-SecureString $globalNode.secPwd -AsPlainText -Force
2091+
#$cred = New-Object System.Management.Automation.PSCredential ($globalNode.applicationId, $secpasswd)
2092+
#Add-AzAccount -ServicePrincipal -Tenant $globalNode.tenantId -SubscriptionId $globalNode.subscriptionId -Credential $cred
20852093

20862094
$ctxoauth = New-AzStorageContext -StorageAccountName $accountname -EnableFileBackupRequestIntent
20872095
$ctxkey = (Get-AzStorageAccount -ResourceGroupName $resourceGroupName -Name $accountname).Context
@@ -2092,7 +2100,7 @@ Describe "dataplane test" {
20922100
Set-AzStorageFileContent -ShareName $shareName -Source $localSrcFile -Path $filename -Context $ctxoauth
20932101
New-AzStorageDirectory -ShareName $shareName -Path $dirname -Context $ctxoauth
20942102

2095-
# Share object w/0 fetching properties with OAuth
2103+
# Share object w/o fetching properties with OAuth
20962104
$share = Get-AzStorageShare -Name $shareName -Context $ctxoauth -SkipGetProperty
20972105
$dir = $share | Get-AzStorageFile -Path $dirname
20982106
$file = $share | Get-AzStorageFile -Path $filename
@@ -2417,6 +2425,7 @@ Describe "dataplane test" {
24172425

24182426
$sharename = "testshare1"
24192427
$share = New-AzStorageShare -Name $sharename -Context $ctx
2428+
$share = Get-AzStorageShare -Name $sharename -Context $ctx
24202429

24212430
# Default: allow
24222431
$f = Get-AzStorageFile -ShareName $sharename -Context $ctx

‎src/Storage/RegressionTests/srp.ps1

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,8 @@ BeforeAll {
66
[xml]$config = Get-Content .\config.xml
77
$globalNode = $config.SelectSingleNode("config/section[@id='global']")
88
$testNode = $config.SelectSingleNode("config/section[@id='srp']")
9-
10-
$secpasswd = ConvertTo-SecureString $globalNode.secPwd -AsPlainText -Force
11-
$cred = New-Object System.Management.Automation.PSCredential ($globalNode.applicationId, $secpasswd)
12-
Add-AzAccount -ServicePrincipal -Tenant $globalNode.tenantId -SubscriptionId $globalNode.subscriptionId -Credential $cred
9+
10+
# Connect-AzAccount
1311

1412
$rgname = $globalNode.resourceGroupName
1513
$accountName = GetRandomAccountName
@@ -109,7 +107,7 @@ Describe "Management plan test" {
109107
$accountNameBlobCtn = $accountName + "bctn"
110108
$containerName = GetRandomContainerName #Add 1 every time
111109
$containerName2 = "ctrtodelete"
112-
New-AzStorageAccount -ResourceGroupName $rgname -StorageAccountName $accountNameBlobCtn -SkuName Standard_LRS -Location "westus" -Kind StorageV2
110+
New-AzStorageAccount -ResourceGroupName $rgname -StorageAccountName $accountNameBlobCtn -SkuName Standard_LRS -Location "westus" -Kind StorageV2 -AllowBlobPublicAccess $true
113111

114112
$con = New-AzRmStorageContainer -ResourceGroupName $rgname -StorageAccountName $accountNameBlobCtn -Name $containerName
115113
$con.Name | Should -Be $containerName
@@ -821,7 +819,7 @@ Describe "Management plan test" {
821819
$a.Encryption.KeyVaultProperties.KeyName | Should -Be $keyname
822820
$a.Encryption.KeyVaultProperties.KeyVersion | Should -BeNullOrEmpty
823821

824-
Remove-AzStorageAccount -ResourceGroupName $rgname -Name $accountNameKeyV -Force
822+
Remove-AzStorageAccount -ResourceGroupName $rgname -Name $accountNameKeyV -Force -AsJob
825823

826824
$Error.Count | should -be 0
827825
}
@@ -859,8 +857,8 @@ Describe "Management plan test" {
859857
set-AzStorageAccount -ResourceGroupName $rgname -StorageAccountName $accountNameRAGZRS -SkuName Standard_GZRS
860858
(Get-AzStorageAccount -ResourceGroupName $rgname -StorageAccountName $accountNameRAGZRS).Sku.Name | should -Be "Standard_GZRS"
861859

862-
Remove-AzStorageAccount -ResourceGroupName $rgname -StorageAccountName $accountNameGZRS -Force
863-
Remove-AzStorageAccount -ResourceGroupName $rgname -StorageAccountName $accountNameRAGZRS -Force
860+
Remove-AzStorageAccount -ResourceGroupName $rgname -StorageAccountName $accountNameGZRS -Force -AsJob
861+
Remove-AzStorageAccount -ResourceGroupName $rgname -StorageAccountName $accountNameRAGZRS -Force -AsJob
864862

865863
$Error.Count | should -be 0
866864
}
@@ -1009,8 +1007,8 @@ Describe "Management plan test" {
10091007
($srcPolicy.Rules[1].Filters.MinCreationTime.ToUniversalTime().ToString("s")+"Z") | Should -Be "2019-01-02T00:00:00Z"
10101008

10111009
# Validate dataplane
1012-
$ctxsrc = (Get-AzStorageAccount -ResourceGroupName $rgname -StorageAccountName $srcAccountName ).Context
1013-
$ctxdest = (Get-AzStorageAccount -ResourceGroupName $rgname -StorageAccountName $destAccountName ).Context
1010+
$ctxsrc = New-AzStorageContext -StorageAccountName $srcAccountName
1011+
$ctxdest = New-AzStorageContext -StorageAccountName $destAccountName
10141012
$blobdest = Get-AzStorageBlob -Container dest1 -Blob testors -Context $ctxdest
10151013
$blobdest.BlobProperties.ObjectReplicationDestinationPolicyId | should -Not -be $null
10161014
$blobdest.BlobProperties.ObjectReplicationSourceProperties | Should -BeNullOrEmpty
@@ -2881,7 +2879,7 @@ Describe "Management plan test" {
28812879
$Error.Count | should -be 0
28822880
}
28832881

2884-
It "AADKerb" {
2882+
It "AADKerb -Skip" {
28852883
$Error.Clear()
28862884

28872885
$accountNameAADKerb = $accountName + "aadkerb"

0 commit comments

Comments
 (0)