Skip to content

Commit f1b7543

Browse files
authored
[Storage] Fix some dataplane test case (#12498)
1 parent 6cbfad7 commit f1b7543

File tree

1 file changed

+15
-15
lines changed

1 file changed

+15
-15
lines changed

src/Storage/Storage.Management.Test/ScenarioTests/StorageDataPlaneTests.ps1

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -70,11 +70,11 @@ function Test-File
7070
Assert-AreEqual $file[0].Name $objectName1
7171
if ($Env:OS -eq "Windows_NT")
7272
{
73-
$file[0].FetchAttributes()
73+
$file[0].CloudFile.FetchAttributes()
7474
$localFileProperties = Get-ItemProperty $localSrcFile
75-
Assert-AreEqual $localFileProperties.CreationTime.ToUniversalTime().Ticks $file[0].Properties.CreationTime.ToUniversalTime().Ticks
76-
Assert-AreEqual $localFileProperties.LastWriteTime.ToUniversalTime().Ticks $file[0].Properties.LastWriteTime.ToUniversalTime().Ticks
77-
Assert-AreEqual $localFileProperties.Attributes.ToString() $file[0].Properties.NtfsAttributes.ToString()
75+
Assert-AreEqual $localFileProperties.CreationTime.ToUniversalTime().Ticks $file[0].CloudFile.Properties.CreationTime.ToUniversalTime().Ticks
76+
Assert-AreEqual $localFileProperties.LastWriteTime.ToUniversalTime().Ticks $file[0].CloudFile.Properties.LastWriteTime.ToUniversalTime().Ticks
77+
Assert-AreEqual $localFileProperties.Attributes.ToString() $file[0].CloudFile.Properties.NtfsAttributes.ToString()
7878
}
7979

8080
Start-AzStorageFileCopy -SrcShareName $shareName -SrcFilePath $objectName1 -DestShareName $shareName -DestFilePath $objectName2 -Force -Context $storageContext -DestContext $storageContext
@@ -103,29 +103,29 @@ function Test-File
103103
{
104104
$file = Get-AzStorageFile -ShareName $shareName -Path $objectName1 -Context $storageContext
105105
$localFileProperties = Get-ItemProperty $localSrcFile
106-
Assert-AreEqual $localFileProperties.CreationTime.ToUniversalTime().Ticks $file[0].Properties.CreationTime.ToUniversalTime().Ticks
107-
Assert-AreEqual $localFileProperties.LastWriteTime.ToUniversalTime().Ticks $file[0].Properties.LastWriteTime.ToUniversalTime().Ticks
108-
Assert-AreEqual $localFileProperties.Attributes.ToString() $file[0].Properties.NtfsAttributes.ToString()
106+
Assert-AreEqual $localFileProperties.CreationTime.ToUniversalTime().Ticks $file[0].CloudFile.Properties.CreationTime.ToUniversalTime().Ticks
107+
Assert-AreEqual $localFileProperties.LastWriteTime.ToUniversalTime().Ticks $file[0].CloudFile.Properties.LastWriteTime.ToUniversalTime().Ticks
108+
Assert-AreEqual $localFileProperties.Attributes.ToString() $file[0].CloudFile.Properties.NtfsAttributes.ToString()
109109
}
110110

111111
Remove-AzStorageFile -ShareName $shareName -Path $objectName1 -Context $storageContext
112112
$file = Get-AzStorageFile -ShareName $shareName -Context $storageContext
113113
Assert-AreEqual $file.Count 1
114114
Assert-AreEqual $file[0].Name $objectName2
115115

116-
$dirName = "filetestdir"
116+
$dirName = "filetestdir"
117117
New-AzStorageDirectory -ShareName $shareName -Path $dirName -Context $storageContext
118118
$file = Get-AzStorageFile -ShareName $shareName -Context $storageContext
119119
Assert-AreEqual $file.Count 2
120120
Assert-AreEqual $file[0].Name $objectName2
121-
Assert-AreEqual $file[0].GetType().Name "CloudFile"
121+
Assert-AreEqual $file[0].GetType().Name "AzureStorageFile"
122122
Assert-AreEqual $file[1].Name $dirName
123-
Assert-AreEqual $file[1].GetType().Name "CloudFileDirectory"
123+
Assert-AreEqual $file[1].GetType().Name "AzureStorageFileDirectory"
124124
Get-AzStorageFile -ShareName $shareName -Path $dirName -Context $storageContext | Remove-AzStorageDirectory
125125
$file = Get-AzStorageFile -ShareName $shareName -Context $storageContext
126126
Assert-AreEqual $file.Count 1
127127
Assert-AreEqual $file[0].Name $objectName2
128-
Assert-AreEqual $file[0].GetType().Name "CloudFile"
128+
Assert-AreEqual $file[0].GetType().Name "AzureStorageFile"
129129

130130
# Clean Storage Account
131131
Remove-AzStorageShare -Name $shareName -Force -Context $storageContext
@@ -806,7 +806,7 @@ function Test-DatalakeGen2
806806
Assert-NotNull $items[0].Permissions
807807
$items = Get-AzDataLakeGen2ChildItem -Context $storageContext -FileSystem $filesystemName -Recurse
808808
Assert-AreEqual $items.Count 4
809-
Assert-Null $items[0].Permissions
809+
Assert-AreEqual "rw-rw--wx" $items[0].Permissions.ToSymbolicPermissions()
810810

811811
#download File
812812
$t = Get-AzDataLakeGen2ItemContent -Context $storageContext -FileSystem $filesystemName -Path $filePath1 -Destination $localDestFile -AsJob -Force
@@ -820,16 +820,16 @@ function Test-DatalakeGen2
820820
$file3 = Move-AzDataLakeGen2Item -Context $storageContext -FileSystem $filesystemName -Path $filePath2 -DestFileSystem $filesystemName -DestPath $filePath3 -Force
821821
$file3 = Get-AzDataLakeGen2Item -Context $storageContext -FileSystem $filesystemName -Path $filePath3
822822
Assert-AreEqual $file3.Path $filePath3
823-
Assert-AreEqual $file3.Permissions $file2.Permissions
823+
Assert-AreEqual $file3.Permissions.ToSymbolicPermissions() $file2.Permissions.ToSymbolicPermissions()
824824
$file2 = $file3 | Move-AzDataLakeGen2Item -DestFileSystem $filesystemName -DestPath $filePath2
825825
$file2 = Get-AzDataLakeGen2Item -Context $storageContext -FileSystem $filesystemName -Path $filePath2
826826
Assert-AreEqual $file2.Path $filePath2
827-
Assert-AreEqual $file2.Permissions $file3.Permissions
827+
Assert-AreEqual $file2.Permissions.ToSymbolicPermissions() $file3.Permissions.ToSymbolicPermissions()
828828
## Move Folder
829829
$dir3 = Move-AzDataLakeGen2Item -Context $storageContext -FileSystem $filesystemName -Path $directoryPath1 -DestFileSystem $filesystemName -DestPath $directoryPath3
830830
$dir3 = Get-AzDataLakeGen2Item -Context $storageContext -FileSystem $filesystemName -Path $directoryPath3
831831
Assert-AreEqual $dir3.Path $directoryPath3
832-
Assert-AreEqual $dir3.Permissions $dir1.Permissions
832+
Assert-AreEqual $dir3.Permissions.ToSymbolicPermissions() $dir1.Permissions.ToSymbolicPermissions()
833833
$dir1 = $dir3 | Move-AzDataLakeGen2Item -DestFileSystem $filesystemName -DestPath $directoryPath1
834834
$dir1 = Get-AzDataLakeGen2Item -Context $storageContext -FileSystem $filesystemName -Path $directoryPath1
835835
Assert-AreEqual $dir1.Path $directoryPath1

0 commit comments

Comments
 (0)