Merge pull request #148 from apelisse/run-union-after

Run non-required union tests last

Author: k8s-ci-robot

internal/fixture/state.go

@@ -425,14 +425,6 @@ func (tc TestCase) TestWithConverter(parser typed.ParseableType, converter merge
 	}
 	if tc.RequiresUnions {
 		state.Updater.EnableUnionFeature()
-	} else {
-		// Also test it with unions on.
-		tc2 := tc
-		tc2.RequiresUnions = true
-		err := tc2.TestWithConverter(parser, converter)
-		if err != nil {
-			return fmt.Errorf("fails if unions are on: %v", err)
-		}
 	}
 	// We currently don't have any test that converts, we can take
 	// care of that later.
@@ -467,5 +459,15 @@ func (tc TestCase) TestWithConverter(parser typed.ParseableType, converter merge
 		}
 	}
 
+	if !tc.RequiresUnions {
+		// Re-run the test with unions on.
+		tc2 := tc
+		tc2.RequiresUnions = true
+		err := tc2.TestWithConverter(parser, converter)
+		if err != nil {
+			return fmt.Errorf("fails if unions are on: %v", err)
+		}
+	}
+
 	return nil
 }