Skip to content

Commit a2cfe3d

Browse files
committed
Fix skipTestOrProceedWithBranch won't skip Rename_symlink tests on master branch
1 parent da333c5 commit a2cfe3d

1 file changed

Lines changed: 6 additions & 5 deletions

File tree

test/e2e/testsuites/gcsfuse_integration.go

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -178,6 +178,12 @@ func (t *gcsFuseCSIGCSFuseIntegrationTestSuite) DefineTests(driver storageframew
178178
// qualifies the non-managed driver to run all the tests.
179179
skipTestOrProceedWithBranch := func(gcsfuseVersionStr, testName string) string {
180180
v, branch := utils.GCSFuseBranch(gcsfuseVersionStr)
181+
182+
// Rename_symlink tests are in separat test package only of v2.11.4 for now
183+
if testName == testNameRenameSymlink && (v.AtLeast(version.MustParseSemantic("v3.0.0-gke.0")) || v.LessThan(version.MustParseSemantic("v2.11.4-gke.0")) || branch == utils.MasterBranchName) {
184+
e2eskipper.Skipf("skip gcsfuse integration rename_symlink test on gcsfuse version %v", v.String())
185+
}
186+
181187
if branch == utils.MasterBranchName {
182188
return branch
183189
}
@@ -225,11 +231,6 @@ func (t *gcsFuseCSIGCSFuseIntegrationTestSuite) DefineTests(driver storageframew
225231
e2eskipper.Skipf("skip gcsfuse integration test %v for gcsfuse version %v", testNameBufferedReads, v.String())
226232
}
227233

228-
// Rename_symlink tests are in separat test package only of v2.11.4 for now
229-
if testName == testNameRenameSymlink && (v.AtLeast(version.MustParseSemantic("v3.0.0-gke.0")) || v.LessThan(version.MustParseSemantic("v2.11.4-gke.0")) || branch == utils.MasterBranchName) {
230-
e2eskipper.Skipf("skip gcsfuse integration rename_symlink test on gcsfuse version %v", v.String())
231-
}
232-
233234
return branch
234235
}
235236

0 commit comments

Comments
 (0)