Skip to content

Commit 22bfbc1

Browse files
vipnydavvipnydav
committed
test(implicit_dir): bifurcate implicit_dir integration tests for rapid writes
1 parent ab36809 commit 22bfbc1

6 files changed

Lines changed: 187 additions & 115 deletions

File tree

‎tools/integration_tests/implicit_dir/delete_test.go‎

Lines changed: 20 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ package implicit_dir_test
1717

1818
import (
1919
"path"
20-
"testing"
2120

2221
"github.com/googlecloudplatform/gcsfuse/v3/tools/integration_tests/util/operations"
2322
"github.com/googlecloudplatform/gcsfuse/v3/tools/integration_tests/util/setup/implicit_and_explicit_dir_setup"
@@ -28,29 +27,29 @@ import (
2827
// testBucket/dirForImplicitDirTests/testDir/implicitDirectory/fileInImplicitDir1 -- File
2928
// testBucket/dirForImplicitDirTests/testDir/implicitDirectory/implicitSubDirectory -- Dir
3029
// testBucket/dirForImplicitDirTests/testDir/implicitDirectory/implicitSubDirectory/fileInImplicitDir2 -- File
31-
func TestDeleteNonEmptyImplicitDir(t *testing.T) {
30+
func (s *implicitDirTestSuite) TestDeleteNonEmptyImplicitDir() {
3231
testDirName := "testDeleteNonEmptyImplicitDir"
3332
testDirPath := setupTestDir(testDirName)
34-
implicit_and_explicit_dir_setup.CreateImplicitDirectoryStructureUsingStorageClient(testEnv.ctx, t, testEnv.storageClient, path.Join(DirForImplicitDirTests, testDirName))
33+
implicit_and_explicit_dir_setup.CreateImplicitDirectoryStructureUsingStorageClient(testEnv.ctx, s.T(), testEnv.storageClient, path.Join(DirForImplicitDirTests, testDirName))
3534

3635
dirPath := path.Join(testDirPath, implicit_and_explicit_dir_setup.ImplicitDirectory)
3736

38-
implicit_and_explicit_dir_setup.RemoveAndCheckIfDirIsDeleted(dirPath, implicit_and_explicit_dir_setup.ImplicitDirectory, t)
37+
implicit_and_explicit_dir_setup.RemoveAndCheckIfDirIsDeleted(dirPath, implicit_and_explicit_dir_setup.ImplicitDirectory, s.T())
3938
}
4039

4140
// Directory Structure
4241
// testBucket/dirForImplicitDirTests/testDir/implicitDirectory -- Dir
4342
// testBucket/dirForImplicitDirTests/testDir/implicitDirectory/fileInImplicitDir1 -- File
4443
// testBucket/dirForImplicitDirTests/testDir/implicitDirectory/implicitSubDirectory -- Dir
4544
// testBucket/dirForImplicitDirTests/testDir/implicitDirectory/implicitSubDirectory/fileInImplicitDir2 -- File
46-
func TestDeleteNonEmptyImplicitSubDir(t *testing.T) {
45+
func (s *implicitDirTestSuite) TestDeleteNonEmptyImplicitSubDir() {
4746
testDirName := "testDeleteNonEmptyImplicitSubDir"
4847
testDirPath := setupTestDir(testDirName)
49-
implicit_and_explicit_dir_setup.CreateImplicitDirectoryStructureUsingStorageClient(testEnv.ctx, t, testEnv.storageClient, path.Join(DirForImplicitDirTests, testDirName))
48+
implicit_and_explicit_dir_setup.CreateImplicitDirectoryStructureUsingStorageClient(testEnv.ctx, s.T(), testEnv.storageClient, path.Join(DirForImplicitDirTests, testDirName))
5049

5150
subDirPath := path.Join(testDirPath, implicit_and_explicit_dir_setup.ImplicitDirectory, implicit_and_explicit_dir_setup.ImplicitSubDirectory)
5251

53-
implicit_and_explicit_dir_setup.RemoveAndCheckIfDirIsDeleted(subDirPath, implicit_and_explicit_dir_setup.ImplicitSubDirectory, t)
52+
implicit_and_explicit_dir_setup.RemoveAndCheckIfDirIsDeleted(subDirPath, implicit_and_explicit_dir_setup.ImplicitSubDirectory, s.T())
5453
}
5554

5655
// Directory Structure
@@ -60,18 +59,18 @@ func TestDeleteNonEmptyImplicitSubDir(t *testing.T) {
6059
// testBucket/dirForImplicitDirTests/testDir/implicitDirectory/fileInImplicitDir1 -- File
6160
// testBucket/dirForImplicitDirTests/testDir/implicitDirectory/implicitSubDirectory -- Dir
6261
// testBucket/dirForImplicitDirTests/testDir/implicitDirectory/implicitSubDirectory/fileInImplicitDir2 -- File
63-
func TestDeleteImplicitDirWithExplicitSubDir(t *testing.T) {
62+
func (s *implicitDirTestSuite) TestDeleteImplicitDirWithExplicitSubDir() {
6463
testDirName := "testDeleteImplicitDirWithExplicitSubDir"
6564
testDirPath := setupTestDir(testDirName)
66-
implicit_and_explicit_dir_setup.CreateImplicitDirectoryStructureUsingStorageClient(testEnv.ctx, t, testEnv.storageClient, path.Join(DirForImplicitDirTests, testDirName))
65+
implicit_and_explicit_dir_setup.CreateImplicitDirectoryStructureUsingStorageClient(testEnv.ctx, s.T(), testEnv.storageClient, path.Join(DirForImplicitDirTests, testDirName))
6766

6867
explicitDirPath := path.Join(testDirPath, implicit_and_explicit_dir_setup.ImplicitDirectory, ExplicitDirInImplicitDir)
6968

70-
operations.CreateDirectoryWithNFiles(NumberOfFilesInExplicitDirInImplicitDir, explicitDirPath, PrefixFileInExplicitDirInImplicitDir, t)
69+
operations.CreateDirectoryWithNFiles(NumberOfFilesInExplicitDirInImplicitDir, explicitDirPath, PrefixFileInExplicitDirInImplicitDir, s.T())
7170

7271
dirPath := path.Join(testDirPath, implicit_and_explicit_dir_setup.ImplicitDirectory)
7372

74-
implicit_and_explicit_dir_setup.RemoveAndCheckIfDirIsDeleted(dirPath, implicit_and_explicit_dir_setup.ImplicitDirectory, t)
73+
implicit_and_explicit_dir_setup.RemoveAndCheckIfDirIsDeleted(dirPath, implicit_and_explicit_dir_setup.ImplicitDirectory, s.T())
7574
}
7675

7776
// Directory Structure
@@ -81,17 +80,17 @@ func TestDeleteImplicitDirWithExplicitSubDir(t *testing.T) {
8180
// testBucket/dirForImplicitDirTests/testDir/implicitDirectory/implicitSubDirectory/fileInImplicitDir2 -- File
8281
// testBucket/dirForImplicitDirTests/testDir/implicitDirectory/implicitSubDirectory/explicitDirInImplicitDir -- Dir
8382
// testBucket/dirForImplicitDirTests/testDir/implicitDirectory/implicitSubDirectory/explicitDirInImplicitDir/fileInExplicitDirInImplicitDir -- File
84-
func TestDeleteImplicitDirWithImplicitSubDirContainingExplicitDir(t *testing.T) {
83+
func (s *implicitDirTestSuite) TestDeleteImplicitDirWithImplicitSubDirContainingExplicitDir() {
8584
testDirName := "testDeleteImplicitDirWithImplicitSubDirContainingExplicitDir"
8685
testDirPath := setupTestDir(testDirName)
87-
implicit_and_explicit_dir_setup.CreateImplicitDirectoryStructureUsingStorageClient(testEnv.ctx, t, testEnv.storageClient, path.Join(DirForImplicitDirTests, testDirName))
86+
implicit_and_explicit_dir_setup.CreateImplicitDirectoryStructureUsingStorageClient(testEnv.ctx, s.T(), testEnv.storageClient, path.Join(DirForImplicitDirTests, testDirName))
8887
explicitDirPath := path.Join(testDirPath, implicit_and_explicit_dir_setup.ImplicitDirectory, implicit_and_explicit_dir_setup.ImplicitSubDirectory, ExplicitDirInImplicitSubDir)
8988

90-
operations.CreateDirectoryWithNFiles(NumberOfFilesInExplicitDirInImplicitSubDir, explicitDirPath, PrefixFileInExplicitDirInImplicitSubDir, t)
89+
operations.CreateDirectoryWithNFiles(NumberOfFilesInExplicitDirInImplicitSubDir, explicitDirPath, PrefixFileInExplicitDirInImplicitSubDir, s.T())
9190

9291
dirPath := path.Join(testDirPath, implicit_and_explicit_dir_setup.ImplicitDirectory)
9392

94-
implicit_and_explicit_dir_setup.RemoveAndCheckIfDirIsDeleted(dirPath, implicit_and_explicit_dir_setup.ImplicitDirectory, t)
93+
implicit_and_explicit_dir_setup.RemoveAndCheckIfDirIsDeleted(dirPath, implicit_and_explicit_dir_setup.ImplicitDirectory, s.T())
9594
}
9695

9796
// Directory Structure
@@ -103,14 +102,14 @@ func TestDeleteImplicitDirWithImplicitSubDirContainingExplicitDir(t *testing.T)
103102
// testBucket/dirForImplicitDirTests/testDir/explicitDirectory/implicitDirectory/fileInImplicitDir1 -- File
104103
// testBucket/dirForImplicitDirTests/testDir/explicitDirectory/implicitDirectory/implicitSubDirectory -- Dir
105104
// testBucket/dirForImplicitDirTests/testDir/explicitDirectory/implicitDirectory/implicitSubDirectory/fileInImplicitDir2 -- File
106-
func TestDeleteImplicitDirInExplicitDir(t *testing.T) {
105+
func (s *implicitDirTestSuite) TestDeleteImplicitDirInExplicitDir() {
107106
testDirName := "testDeleteImplicitDirInExplicitDir"
108107
testDirPath := setupTestDir(testDirName)
109-
implicit_and_explicit_dir_setup.CreateImplicitDirectoryInExplicitDirectoryStructureUsingStorageClient(testEnv.ctx, t, testEnv.storageClient, path.Join(DirForImplicitDirTests, testDirName))
108+
implicit_and_explicit_dir_setup.CreateImplicitDirectoryInExplicitDirectoryStructureUsingStorageClient(testEnv.ctx, s.T(), testEnv.storageClient, path.Join(DirForImplicitDirTests, testDirName))
110109

111110
dirPath := path.Join(testDirPath, implicit_and_explicit_dir_setup.ExplicitDirectory, implicit_and_explicit_dir_setup.ImplicitDirectory)
112111

113-
implicit_and_explicit_dir_setup.RemoveAndCheckIfDirIsDeleted(dirPath, implicit_and_explicit_dir_setup.ImplicitDirectory, t)
112+
implicit_and_explicit_dir_setup.RemoveAndCheckIfDirIsDeleted(dirPath, implicit_and_explicit_dir_setup.ImplicitDirectory, s.T())
114113
}
115114

116115
// Directory Structure
@@ -122,12 +121,12 @@ func TestDeleteImplicitDirInExplicitDir(t *testing.T) {
122121
// testBucket/dirForImplicitDirTests/testDir/explicitDirectory/implicitDirectory/fileInImplicitDir1 -- File
123122
// testBucket/dirForImplicitDirTests/testDir/explicitDirectory/implicitDirectory/implicitSubDirectory -- Dir
124123
// testBucket/dirForImplicitDirTests/testDir/explicitDirectory/implicitDirectory/implicitSubDirectory/fileInImplicitDir2 -- File
125-
func TestDeleteExplicitDirContainingImplicitSubDir(t *testing.T) {
124+
func (s *implicitDirTestSuite) TestDeleteExplicitDirContainingImplicitSubDir() {
126125
testDirName := "testDeleteExplicitDirContainingImplicitSubDir"
127126
testDirPath := setupTestDir(testDirName)
128-
implicit_and_explicit_dir_setup.CreateImplicitDirectoryInExplicitDirectoryStructureUsingStorageClient(testEnv.ctx, t, testEnv.storageClient, path.Join(DirForImplicitDirTests, testDirName))
127+
implicit_and_explicit_dir_setup.CreateImplicitDirectoryInExplicitDirectoryStructureUsingStorageClient(testEnv.ctx, s.T(), testEnv.storageClient, path.Join(DirForImplicitDirTests, testDirName))
129128

130129
dirPath := path.Join(testDirPath, implicit_and_explicit_dir_setup.ExplicitDirectory)
131130

132-
implicit_and_explicit_dir_setup.RemoveAndCheckIfDirIsDeleted(dirPath, implicit_and_explicit_dir_setup.ExplicitDirectory, t)
131+
implicit_and_explicit_dir_setup.RemoveAndCheckIfDirIsDeleted(dirPath, implicit_and_explicit_dir_setup.ExplicitDirectory, s.T())
133132
}

‎tools/integration_tests/implicit_dir/implicit_dir_test.go‎

Lines changed: 52 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,16 @@ import (
2020
"log"
2121
"os"
2222
"path"
23+
"strings"
2324
"testing"
2425

2526
"cloud.google.com/go/storage"
2627
"github.com/googlecloudplatform/gcsfuse/v3/tools/integration_tests/util/client"
28+
"github.com/googlecloudplatform/gcsfuse/v3/tools/integration_tests/util/mounting/persistent_mounting"
29+
"github.com/googlecloudplatform/gcsfuse/v3/tools/integration_tests/util/mounting/static_mounting"
2730
"github.com/googlecloudplatform/gcsfuse/v3/tools/integration_tests/util/setup"
28-
"github.com/googlecloudplatform/gcsfuse/v3/tools/integration_tests/util/setup/implicit_and_explicit_dir_setup"
2931
"github.com/googlecloudplatform/gcsfuse/v3/tools/integration_tests/util/test_suite"
32+
"github.com/stretchr/testify/suite"
3033
)
3134

3235
const ExplicitDirInImplicitDir = "explicitDirInImplicitDir"
@@ -45,10 +48,51 @@ type env struct {
4548
storageClient *storage.Client
4649
ctx context.Context
4750
testDirPath string
51+
cfg *test_suite.TestConfig
52+
bucketType string
4853
}
4954

5055
var testEnv env
5156

57+
type implicitDirTestSuite struct {
58+
suite.Suite
59+
}
60+
61+
func (s *implicitDirTestSuite) TearDownTest() {
62+
setup.SaveGCSFuseLogFileInCaseOfFailure(s.T())
63+
}
64+
65+
func runImplicitDirSuite(t *testing.T, runSuiteFunc func()) {
66+
// Run tests for mounted directory if the flag is set. This assumes that run flag is properly passed by GKE team as per the config.
67+
if testEnv.cfg.GKEMountedDirectory != "" && testEnv.cfg.TestBucket != "" {
68+
runSuiteFunc()
69+
return
70+
}
71+
72+
// Run tests for GCE environment otherwise.
73+
flagsSet := setup.BuildFlagSets(*testEnv.cfg, testEnv.bucketType, t.Name())
74+
for _, flags := range flagsSet {
75+
t.Run(strings.Join(flags, "_"), func(t *testing.T) {
76+
// 1. Static mounting
77+
t.Run("Static", func(t *testing.T) {
78+
static_mounting.RunSuiteForStaticMounting(testEnv.cfg, flags, t, runSuiteFunc)
79+
})
80+
81+
// 2. Persistent mounting
82+
t.Run("Persistent", func(t *testing.T) {
83+
persistent_mounting.RunSuiteForPersistentMounting(testEnv.cfg, flags, t, runSuiteFunc)
84+
})
85+
})
86+
}
87+
}
88+
89+
func TestImplicitDirBase(t *testing.T) {
90+
runImplicitDirSuite(t, func() {
91+
suite.Run(t, new(implicitDirTestSuite))
92+
suite.Run(t, &implicitDirLocalFileTest{isRapidWritesEnabled: false})
93+
})
94+
}
95+
5296
func setupTestDir(dirName string) string {
5397
dir := setup.SetupTestDirectory(DirForImplicitDirTests)
5498
dirPath := path.Join(dir, dirName)
@@ -71,7 +115,8 @@ func TestMain(m *testing.M) {
71115

72116
// 2. Create storage client before running tests.
73117
testEnv.ctx = context.Background()
74-
bucketType := setup.TestEnvironment(testEnv.ctx, &cfg.ImplicitDir[0])
118+
testEnv.bucketType = setup.TestEnvironment(testEnv.ctx, &cfg.ImplicitDir[0])
119+
testEnv.cfg = &cfg.ImplicitDir[0]
75120
closeStorageClient := client.CreateStorageClientWithCancel(&testEnv.ctx, &testEnv.storageClient)
76121
defer func() {
77122
err := closeStorageClient()
@@ -80,11 +125,12 @@ func TestMain(m *testing.M) {
80125
}
81126
}()
82127

83-
// 3. Build the flag sets dynamically from the config.
84-
flags := setup.BuildFlagSets(cfg.ImplicitDir[0], bucketType, "")
128+
// 3. Set up test directory for test bucket.
129+
setup.SetUpTestDirForTestBucket(testEnv.cfg)
130+
setup.OverrideFilePathsInFlagSet(testEnv.cfg, setup.TestDir())
85131

86-
// 4. Run tests with the dynamically generated flags.
87-
successCode := implicit_and_explicit_dir_setup.RunTestsForExplicitAndImplicitDir(&cfg.ImplicitDir[0], flags, m)
132+
// 4. Run tests.
133+
successCode := m.Run()
88134
setup.SaveLogFileInCaseOfFailure(successCode)
89135

90136
// 5. Clean up test directory created.

‎tools/integration_tests/implicit_dir/list_test.go‎

Lines changed: 21 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,13 @@ import (
2121
"os"
2222
"path"
2323
"path/filepath"
24-
"testing"
2524

2625
"github.com/googlecloudplatform/gcsfuse/v3/tools/integration_tests/util/setup"
2726
"github.com/googlecloudplatform/gcsfuse/v3/tools/integration_tests/util/setup/implicit_and_explicit_dir_setup"
2827
"github.com/stretchr/testify/assert"
2928
)
3029

31-
func TestListImplicitObjectsFromBucket(t *testing.T) {
30+
func (s *implicitDirTestSuite) TestListImplicitObjectsFromBucket() {
3231
testDirName := "testListImplicitObjectsFromBucket"
3332
testDirPath := setupTestDir(testDirName)
3433
// Directory Structure
@@ -41,8 +40,8 @@ func TestListImplicitObjectsFromBucket(t *testing.T) {
4140
// testBucket/dirForImplicitDirTests/testDir/explicitDirectory/fileInExplicitDir1 -- File
4241
// testBucket/dirForImplicitDirTests/testDir/explicitDirectory/fileInExplicitDir2 -- File
4342

44-
implicit_and_explicit_dir_setup.CreateImplicitDirectoryStructureUsingStorageClient(testEnv.ctx, t, testEnv.storageClient, path.Join(DirForImplicitDirTests, testDirName))
45-
implicit_and_explicit_dir_setup.CreateExplicitDirectoryStructure(path.Join(DirForImplicitDirTests, testDirName), t)
43+
implicit_and_explicit_dir_setup.CreateImplicitDirectoryStructureUsingStorageClient(testEnv.ctx, s.T(), testEnv.storageClient, path.Join(DirForImplicitDirTests, testDirName))
44+
implicit_and_explicit_dir_setup.CreateExplicitDirectoryStructure(path.Join(DirForImplicitDirTests, testDirName), s.T())
4645

4746
err := filepath.WalkDir(testDirPath, func(path string, dir fs.DirEntry, err error) error {
4847
if err != nil {
@@ -64,39 +63,39 @@ func TestListImplicitObjectsFromBucket(t *testing.T) {
6463
if path == testDirPath {
6564
// numberOfObjects - 3
6665
if len(objs) != implicit_and_explicit_dir_setup.NumberOfTotalObjects {
67-
t.Errorf("Incorrect number of objects in the bucket.")
66+
s.T().Errorf("Incorrect number of objects in the bucket.")
6867
}
6968

7069
// testBucket/dirForImplicitDirTests/testDir/explicitDir -- Dir
7170
if objs[0].Name() != implicit_and_explicit_dir_setup.ExplicitDirectory || objs[0].IsDir() != true {
72-
t.Errorf("Listed incorrect object")
71+
s.T().Errorf("Listed incorrect object")
7372
}
7473
// testBucket/dirForImplicitDirTests/testDir/explicitFile -- File
7574
if objs[1].Name() != implicit_and_explicit_dir_setup.ExplicitFile || objs[1].IsDir() != false {
76-
t.Errorf("Listed incorrect object")
75+
s.T().Errorf("Listed incorrect object")
7776
}
7877

7978
// testBucket/dirForImplicitDirTests/testDir/implicitDir -- Dir
8079
if objs[2].Name() != implicit_and_explicit_dir_setup.ImplicitDirectory || objs[2].IsDir() != true {
81-
t.Errorf("Listed incorrect object")
80+
s.T().Errorf("Listed incorrect object")
8281
}
8382
}
8483

8584
// Check if explictDir directory has correct data.
8685
if dir.IsDir() && dir.Name() == implicit_and_explicit_dir_setup.ExplicitDirectory {
8786
// numberOfObjects - 2
8887
if len(objs) != implicit_and_explicit_dir_setup.NumberOfFilesInExplicitDirectory {
89-
t.Errorf("Incorrect number of objects in the explicitDirectory.")
88+
s.T().Errorf("Incorrect number of objects in the explicitDirectory.")
9089
}
9190

9291
// testBucket/dirForImplicitDirTests/testDir/explicitDir/fileInExplicitDir1 -- File
9392
if objs[0].Name() != implicit_and_explicit_dir_setup.FirstFileInExplicitDirectory || objs[0].IsDir() != false {
94-
t.Errorf("Listed incorrect object")
93+
s.T().Errorf("Listed incorrect object")
9594
}
9695

9796
// testBucket/dirForImplicitDirTests/testDir/explicitDir/fileInExplicitDir2 -- File
9897
if objs[1].Name() != implicit_and_explicit_dir_setup.SecondFileInExplicitDirectory || objs[1].IsDir() != false {
99-
t.Errorf("Listed incorrect object")
98+
s.T().Errorf("Listed incorrect object")
10099
}
101100
return nil
102101
}
@@ -105,16 +104,16 @@ func TestListImplicitObjectsFromBucket(t *testing.T) {
105104
if dir.IsDir() && dir.Name() == implicit_and_explicit_dir_setup.ImplicitDirectory {
106105
// numberOfObjects - 2
107106
if len(objs) != implicit_and_explicit_dir_setup.NumberOfFilesInImplicitDirectory {
108-
t.Errorf("Incorrect number of objects in the implicitDirectory.")
107+
s.T().Errorf("Incorrect number of objects in the implicitDirectory.")
109108
}
110109

111110
// testBucket/dirForImplicitDirTests/testDir/implicitDir/fileInImplicitDir1 -- File
112111
if objs[0].Name() != implicit_and_explicit_dir_setup.FileInImplicitDirectory || objs[0].IsDir() != false {
113-
t.Errorf("Listed incorrect object")
112+
s.T().Errorf("Listed incorrect object")
114113
}
115114
// testBucket/dirForImplicitDirTests/testDir/implicitDir/implicitSubDirectory -- Dir
116115
if objs[1].Name() != implicit_and_explicit_dir_setup.ImplicitSubDirectory || objs[1].IsDir() != true {
117-
t.Errorf("Listed incorrect object")
116+
s.T().Errorf("Listed incorrect object")
118117
}
119118
return nil
120119
}
@@ -123,37 +122,37 @@ func TestListImplicitObjectsFromBucket(t *testing.T) {
123122
if dir.IsDir() && dir.Name() == implicit_and_explicit_dir_setup.ImplicitSubDirectory {
124123
// numberOfObjects - 1
125124
if len(objs) != implicit_and_explicit_dir_setup.NumberOfFilesInImplicitSubDirectory {
126-
t.Errorf("Incorrect number of objects in the implicitSubDirectoryt.")
125+
s.T().Errorf("Incorrect number of objects in the implicitSubDirectoryt.")
127126
}
128127

129128
// testBucket/dirForImplicitDirTests/testDir/implicitDir/implicitSubDir/fileInImplicitDir2 -- File
130129
if objs[0].Name() != implicit_and_explicit_dir_setup.FileInImplicitSubDirectory || objs[0].IsDir() != false {
131-
t.Errorf("Listed incorrect object")
130+
s.T().Errorf("Listed incorrect object")
132131
}
133132
return nil
134133
}
135134
return nil
136135
})
137136
if err != nil {
138-
t.Errorf("error walking the path : %v\n", err)
137+
s.T().Errorf("error walking the path : %v\n", err)
139138
return
140139
}
141140
}
142141

143-
func TestStatImplicitDirAfterList(t *testing.T) {
142+
func (s *implicitDirTestSuite) TestStatImplicitDirAfterList() {
144143
testDirPath := setup.SetupTestDirectory(DirForImplicitDirTests)
145-
implicit_and_explicit_dir_setup.CreateImplicitDirectoryStructureUsingStorageClient(testEnv.ctx, t, testEnv.storageClient, DirForImplicitDirTests)
144+
implicit_and_explicit_dir_setup.CreateImplicitDirectoryStructureUsingStorageClient(testEnv.ctx, s.T(), testEnv.storageClient, DirForImplicitDirTests)
146145

147146
// List the directory
148147
_, err := os.ReadDir(testDirPath)
149148
if err != nil {
150-
t.Fatalf("ReadDir failed: %v", err)
149+
s.T().Fatalf("ReadDir failed: %v", err)
151150
}
152151

153152
// Stat the implicit directory
154153
implicitDirPath := path.Join(testDirPath, implicit_and_explicit_dir_setup.ImplicitDirectory)
155154
f, err := os.Stat(implicitDirPath)
156-
if assert.NoError(t, err) {
157-
assert.True(t, f.IsDir())
155+
if assert.NoError(s.T(), err) {
156+
assert.True(s.T(), f.IsDir())
158157
}
159158
}

0 commit comments

Comments
 (0)