SCMSourceRetrieverTest: clarify messages for "SKIP by pre-test assumption" tests

Author: jimklimov

src/test/java/org/jenkinsci/plugins/workflow/libs/SCMSourceRetrieverTest.java

@@ -415,7 +415,8 @@ private void sampleRepo2ContentUniqueMasterFeatureBogus_staticStrings(String sub
         // by having some checkouts (and so list of SCMs).
 
         // Do not let caller-provided BRANCH_NAME interfere here
-        assumeFalse("An externally provided BRANCH_NAME envvar interferes with tested logic",
+        assumeFalse("SKIP by pre-test assumption: " +
+                        "An externally provided BRANCH_NAME envvar interferes with tested logic",
                 System.getenv("BRANCH_NAME") != null);
 
         sampleRepo1ContentMasterFeature();
@@ -687,7 +688,8 @@ private void sampleRepo2ContentUniqueMasterFeatureBogus_staticStrings(String sub
         System.out.println("MBP source 0: " + mbp.getSourcesList().get(0).getSource().toString());
         System.out.println("MBP source 1: " + mbp.getSourcesList().get(1).getSource().toString());
         System.out.println("Jobs generated by MBP: " + mbp.getItems().toString());
-        assumeFalse("MBP should have generated 'feature' and 'featurette' pipeline job", mbp.getItems().size() != 2);
+        assumeFalse("SKIP by pre-test assumption: " +
+                "MBP should have generated 'feature' and 'featurette' pipeline job", mbp.getItems().size() != 2);
 
         // In case of MBP with "Single repository and branch"
         // it only defines one job (per single-branch source),
@@ -775,7 +777,8 @@ private void sampleRepo2ContentUniqueMasterFeatureBogus_staticStrings(String sub
         System.out.println("MBP source 0: " + mbp.getSourcesList().get(0).getSource().toString());
         System.out.println("MBP source 1: " + mbp.getSourcesList().get(1).getSource().toString());
         System.out.println("Jobs generated by MBP: " + mbp.getItems().toString());
-        assumeFalse("MBP should have generated 'feature' and 'featurette' pipeline job", mbp.getItems().size() != 2);
+        assumeFalse("SKIP by pre-test assumption: " +
+                "MBP should have generated 'feature' and 'featurette' pipeline job", mbp.getItems().size() != 2);
 
         // In case of MBP with "Single repository and branch"
         // it only defines one job (per single-branch source),
@@ -867,7 +870,8 @@ private void sampleRepo2ContentUniqueMasterFeatureBogus_staticStrings(String sub
         // a simple "Pipeline" job with static SCM source,
         // and that even lc.setAllowVersionOverride(false)
         // does not intervene here.
-        assumeFalse("An externally provided BRANCH_NAME envvar interferes with tested logic",
+        assumeFalse("SKIP by pre-test assumption: " +
+                        "An externally provided BRANCH_NAME envvar interferes with tested logic",
             System.getenv("BRANCH_NAME") != null);
 
         sampleRepo1ContentMasterFeature();
@@ -917,7 +921,8 @@ private void sampleRepo2ContentUniqueMasterFeatureBogus_staticStrings(String sub
         // "unexpected" log message (so far expected due
         // to the bug being hunted), but counts the faults
         // and asserts in the end whether there were none.
-        assumeFalse("An externally provided BRANCH_NAME envvar interferes with tested logic",
+        assumeFalse("SKIP by pre-test assumption: " +
+                        "An externally provided BRANCH_NAME envvar interferes with tested logic",
                 System.getenv("BRANCH_NAME") != null);
 
         sampleRepo1ContentMasterFeatureStable();
@@ -1034,7 +1039,8 @@ private void sampleRepo2ContentUniqueMasterFeatureBogus_staticStrings(String sub
         // TODO: If this behavior does change, extend
         // the test to also try ${env.VARNAME} confusion.
 
-        assumeFalse("An externally provided BRANCH_NAME envvar interferes with tested logic",
+        assumeFalse("SKIP by pre-test assumption: " +
+                        "An externally provided BRANCH_NAME envvar interferes with tested logic",
                 System.getenv("BRANCH_NAME") != null);
 
         sampleRepo1ContentMasterFeature();
@@ -1079,7 +1085,9 @@ private void sampleRepo2ContentUniqueMasterFeatureBogus_staticStrings(String sub
             r.assertLogContains("was not a constant; did you mean to use the", b1);
             r.assertLogContains("step instead?", b1);
             // assertions survived, skip the test
-            assumeFalse("LibraryDecorator forbids use of double-quotes for @Library annotation", true);
+            // not exactly "pre-test" but oh well
+            assumeFalse("SKIP by pre-test assumption: " +
+                    "LibraryDecorator forbids use of double-quotes for @Library annotation", true);
         } catch(AssertionError x) {
             // Chosen library version should not be "whatever"
             // causing fallback to "master", but "feature" per
@@ -1095,7 +1103,8 @@ private void sampleRepo2ContentUniqueMasterFeatureBogus_staticStrings(String sub
         // Test that lightweight checkouts from SCM allow
         // @Library('branchylib@${BRANCH_NAME}') to see
         // sufficient SCM context to determine the branch.
-        assumeFalse("An externally provided BRANCH_NAME envvar interferes with tested logic",
+        assumeFalse("SKIP by pre-test assumption: " +
+                        "An externally provided BRANCH_NAME envvar interferes with tested logic",
                 System.getenv("BRANCH_NAME") != null);
 
         sampleRepo1ContentMasterFeature();
@@ -1136,7 +1145,8 @@ private void sampleRepo2ContentUniqueMasterFeatureBogus_staticStrings(String sub
         // is resolved with the TEST_VAR_NAME="feature" in environment.
 
         // Do not let caller-provided BRANCH_NAME interfere here
-        assumeFalse("An externally provided TEST_VAR_NAME envvar interferes with tested logic",
+        assumeFalse("SKIP by pre-test assumption: " +
+                        "An externally provided TEST_VAR_NAME envvar interferes with tested logic",
                 System.getenv("TEST_VAR_NAME") != null);
 
         sampleRepo1ContentMasterFeatureStable();
@@ -1203,7 +1213,8 @@ private void sampleRepo2ContentUniqueMasterFeatureBogus_staticStrings(String sub
             ecOrig.add(ec);
         }
         ecList.removeAll(ecOrig);
-        assumeFalse("EnvironmentContributor.all() should be empty now", !ecList.isEmpty());
+        assumeFalse("SKIP by pre-test assumption: " +
+                "EnvironmentContributor.all() should be empty now", !ecList.isEmpty());
 
         ecList.add(new EnvironmentContributor() {
             @Override public void buildEnvironmentFor(Run run, EnvVars ev, TaskListener tl) throws IOException, InterruptedException {
@@ -1655,7 +1666,8 @@ public static class BasicSCMSource extends SCMSource {
 
     @Issue("SECURITY-2463")
     @Test public void checkoutDirectoriesAreNotReusedByDifferentScms() throws Exception {
-        assumeFalse("checkoutDirectoriesAreNotReusedByDifferentScms() is " +
+        assumeFalse("SKIP by pre-test assumption: " +
+                        "checkoutDirectoriesAreNotReusedByDifferentScms() is " +
                 "skipped on Windows: Checkout hook is not cross-platform",
                 Functions.isWindows());
         sampleRepo.init();