@@ -20,7 +20,6 @@ import (
2020 "testing"
2121
2222 "github.com/googlecloudplatform/gcsfuse/v3/tools/integration_tests/util/operations"
23- "github.com/googlecloudplatform/gcsfuse/v3/tools/integration_tests/util/setup"
2423 "github.com/googlecloudplatform/gcsfuse/v3/tools/integration_tests/util/setup/implicit_and_explicit_dir_setup"
2524)
2625
@@ -32,12 +31,7 @@ import (
3231func TestDeleteNonEmptyImplicitDir (t * testing.T ) {
3332 testDirName := "testDeleteNonEmptyImplicitDir"
3433 testDirPath := setupTestDir (testDirName )
35- // TODO: Remove the condition and keep the storage-client flow for non-ZB too.
36- if setup .IsZonalBucketRun () {
37- implicit_and_explicit_dir_setup .CreateImplicitDirectoryStructureUsingStorageClient (testEnv .ctx , t , testEnv .storageClient , path .Join (DirForImplicitDirTests , testDirName ))
38- } else {
39- implicit_and_explicit_dir_setup .CreateImplicitDirectoryStructure (path .Join (DirForImplicitDirTests , testDirName ))
40- }
34+ implicit_and_explicit_dir_setup .CreateImplicitDirectoryStructureUsingStorageClient (testEnv .ctx , t , testEnv .storageClient , path .Join (DirForImplicitDirTests , testDirName ))
4135
4236 dirPath := path .Join (testDirPath , implicit_and_explicit_dir_setup .ImplicitDirectory )
4337
@@ -52,12 +46,7 @@ func TestDeleteNonEmptyImplicitDir(t *testing.T) {
5246func TestDeleteNonEmptyImplicitSubDir (t * testing.T ) {
5347 testDirName := "testDeleteNonEmptyImplicitSubDir"
5448 testDirPath := setupTestDir (testDirName )
55- // TODO: Remove the condition and keep the storage-client flow for non-ZB too.
56- if setup .IsZonalBucketRun () {
57- implicit_and_explicit_dir_setup .CreateImplicitDirectoryStructureUsingStorageClient (testEnv .ctx , t , testEnv .storageClient , path .Join (DirForImplicitDirTests , testDirName ))
58- } else {
59- implicit_and_explicit_dir_setup .CreateImplicitDirectoryStructure (path .Join (DirForImplicitDirTests , testDirName ))
60- }
49+ implicit_and_explicit_dir_setup .CreateImplicitDirectoryStructureUsingStorageClient (testEnv .ctx , t , testEnv .storageClient , path .Join (DirForImplicitDirTests , testDirName ))
6150
6251 subDirPath := path .Join (testDirPath , implicit_and_explicit_dir_setup .ImplicitDirectory , implicit_and_explicit_dir_setup .ImplicitSubDirectory )
6352
@@ -74,12 +63,7 @@ func TestDeleteNonEmptyImplicitSubDir(t *testing.T) {
7463func TestDeleteImplicitDirWithExplicitSubDir (t * testing.T ) {
7564 testDirName := "testDeleteImplicitDirWithExplicitSubDir"
7665 testDirPath := setupTestDir (testDirName )
77- // TODO: Remove the condition and keep the storage-client flow for non-ZB too.
78- if setup .IsZonalBucketRun () {
79- implicit_and_explicit_dir_setup .CreateImplicitDirectoryStructureUsingStorageClient (testEnv .ctx , t , testEnv .storageClient , path .Join (DirForImplicitDirTests , testDirName ))
80- } else {
81- implicit_and_explicit_dir_setup .CreateImplicitDirectoryStructure (path .Join (DirForImplicitDirTests , testDirName ))
82- }
66+ implicit_and_explicit_dir_setup .CreateImplicitDirectoryStructureUsingStorageClient (testEnv .ctx , t , testEnv .storageClient , path .Join (DirForImplicitDirTests , testDirName ))
8367
8468 explicitDirPath := path .Join (testDirPath , implicit_and_explicit_dir_setup .ImplicitDirectory , ExplicitDirInImplicitDir )
8569
@@ -100,12 +84,7 @@ func TestDeleteImplicitDirWithExplicitSubDir(t *testing.T) {
10084func TestDeleteImplicitDirWithImplicitSubDirContainingExplicitDir (t * testing.T ) {
10185 testDirName := "testDeleteImplicitDirWithImplicitSubDirContainingExplicitDir"
10286 testDirPath := setupTestDir (testDirName )
103- // TODO: Remove the condition and keep the storage-client flow for non-ZB too.
104- if setup .IsZonalBucketRun () {
105- implicit_and_explicit_dir_setup .CreateImplicitDirectoryStructureUsingStorageClient (testEnv .ctx , t , testEnv .storageClient , path .Join (DirForImplicitDirTests , testDirName ))
106- } else {
107- implicit_and_explicit_dir_setup .CreateImplicitDirectoryStructure (path .Join (DirForImplicitDirTests , testDirName ))
108- }
87+ implicit_and_explicit_dir_setup .CreateImplicitDirectoryStructureUsingStorageClient (testEnv .ctx , t , testEnv .storageClient , path .Join (DirForImplicitDirTests , testDirName ))
10988 explicitDirPath := path .Join (testDirPath , implicit_and_explicit_dir_setup .ImplicitDirectory , implicit_and_explicit_dir_setup .ImplicitSubDirectory , ExplicitDirInImplicitSubDir )
11089
11190 operations .CreateDirectoryWithNFiles (NumberOfFilesInExplicitDirInImplicitSubDir , explicitDirPath , PrefixFileInExplicitDirInImplicitSubDir , t )
@@ -127,12 +106,7 @@ func TestDeleteImplicitDirWithImplicitSubDirContainingExplicitDir(t *testing.T)
127106func TestDeleteImplicitDirInExplicitDir (t * testing.T ) {
128107 testDirName := "testDeleteImplicitDirInExplicitDir"
129108 testDirPath := setupTestDir (testDirName )
130- // TODO: Remove the condition and keep the storage-client flow for non-ZB too.
131- if setup .IsZonalBucketRun () {
132- implicit_and_explicit_dir_setup .CreateImplicitDirectoryInExplicitDirectoryStructureUsingStorageClient (testEnv .ctx , t , testEnv .storageClient , path .Join (DirForImplicitDirTests , testDirName ))
133- } else {
134- implicit_and_explicit_dir_setup .CreateImplicitDirectoryInExplicitDirectoryStructure (path .Join (DirForImplicitDirTests , testDirName ), t )
135- }
109+ implicit_and_explicit_dir_setup .CreateImplicitDirectoryInExplicitDirectoryStructureUsingStorageClient (testEnv .ctx , t , testEnv .storageClient , path .Join (DirForImplicitDirTests , testDirName ))
136110
137111 dirPath := path .Join (testDirPath , implicit_and_explicit_dir_setup .ExplicitDirectory , implicit_and_explicit_dir_setup .ImplicitDirectory )
138112
@@ -151,12 +125,7 @@ func TestDeleteImplicitDirInExplicitDir(t *testing.T) {
151125func TestDeleteExplicitDirContainingImplicitSubDir (t * testing.T ) {
152126 testDirName := "testDeleteExplicitDirContainingImplicitSubDir"
153127 testDirPath := setupTestDir (testDirName )
154- // TODO: Remove the condition and keep the storage-client flow for non-ZB too.
155- if setup .IsZonalBucketRun () {
156- implicit_and_explicit_dir_setup .CreateImplicitDirectoryInExplicitDirectoryStructureUsingStorageClient (testEnv .ctx , t , testEnv .storageClient , path .Join (DirForImplicitDirTests , testDirName ))
157- } else {
158- implicit_and_explicit_dir_setup .CreateImplicitDirectoryInExplicitDirectoryStructure (path .Join (DirForImplicitDirTests , testDirName ), t )
159- }
128+ implicit_and_explicit_dir_setup .CreateImplicitDirectoryInExplicitDirectoryStructureUsingStorageClient (testEnv .ctx , t , testEnv .storageClient , path .Join (DirForImplicitDirTests , testDirName ))
160129
161130 dirPath := path .Join (testDirPath , implicit_and_explicit_dir_setup .ExplicitDirectory )
162131
0 commit comments