oops, others should not run everything

temporalio · Oct 25, 2024 · 218a1bd · 218a1bd
1 parent 16039b9
commit 218a1bd
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/tests/testcore/functional_test_base.go b/tests/testcore/functional_test_base.go
@@ -101,6 +101,8 @@ var (
 		"TestAdvancedVisibilitySuite",
 		"TestClientMiscTestSuite",
 	}
+
+	FixedMatchingBehaviorNone = &matchingBehaviorOptions{}
 )
 
 // WithFxOptionsForService returns an Option which, when passed as an argument to setupSuite, will append the given list
@@ -522,7 +524,9 @@ func (s *FunctionalTestBase) GetNamespaceID(namespace string) string {
 }
 
 func (s *FunctionalTestBase) RunTestWithMatchingBehavior(subtest func()) {
-	if s.fixedMatchingBehavior != nil {
+	if s.fixedMatchingBehavior == FixedMatchingBehaviorNone {
+		s.T().Skipf("%s runs in a MB subtest", s.T().Name())
+	} else if s.fixedMatchingBehavior != nil {
 		s.runOneTestWithMatchingBehavior(subtest, s.fixedMatchingBehavior)
 	} else {
 		for _, mbo := range AllMatchingBehaviorOptions() {
@@ -578,7 +582,7 @@ func (s *FunctionalTestBase) SetFixedMatchingBehavior(mbo *matchingBehaviorOptio
 }
 
 func (s *FunctionalTestBase) SkipIfFixedMatchingBehavior() {
-	if s.fixedMatchingBehavior != nil {
+	if s.fixedMatchingBehavior != nil && s.fixedMatchingBehavior != FixedMatchingBehaviorNone {
 		s.T().Skipf("%s runs in 'Others' subtest", s.T().Name())
 	}
 }

diff --git a/tests/versioning_test.go b/tests/versioning_test.go
@@ -93,7 +93,9 @@ func TestVersioningSuite(t *testing.T) {
 	t.Run("Others", func(t *testing.T) {
 		// This sub-test runs all tests that do _not_ use RunTestWithMatchingBehavior.
 		t.Parallel()
-		suite.Run(t, new(VersioningIntegSuite))
+		s := new(VersioningIntegSuite)
+		s.SetFixedMatchingBehavior(testcore.FixedMatchingBehaviorNone)
+		suite.Run(t, s)
 	})
 }