[JENKINS-46064] Remove debug prints and fix a test

jenkinsci · Aug 8, 2017 · abdcb32 · abdcb32
1 parent 9394c09
commit abdcb32
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 6 deletions.
diff --git a/...rg/jenkinsci/plugins/pipeline/modeldefinition/when/impl/ChangelogConditionalScript.groovy b/...rg/jenkinsci/plugins/pipeline/modeldefinition/when/impl/ChangelogConditionalScript.groovy
@@ -52,14 +52,9 @@ class ChangelogConditionalScript extends AbstractChangelogConditionalScript<Chan
         //But it's probably simpler to make a build step that recaptures that information
 
         if (gitChangeSetClass != null && change?.getClass()?.isAssignableFrom(gitChangeSetClass)) {
-            script.echo "We are running git"
-            script.echo "Evaluating " + change.title
-            script.echo "And " + change.comment
             return describable.pattern.matcher(change.title).matches() || describable.multiLinePattern.matcher(change.comment).matches()
         } else {
             //Something generic
-            script.echo "We are running something generic"
-            script.echo "Evaluating " + change.msg
             return describable.pattern.matcher(change.msg).matches()
         }
     }

diff --git a/...on/src/test/java/org/jenkinsci/plugins/pipeline/modeldefinition/AbstractModelDefTest.java b/...on/src/test/java/org/jenkinsci/plugins/pipeline/modeldefinition/AbstractModelDefTest.java
@@ -255,7 +255,7 @@ public static Iterable<Object[]> configsWithErrors() {
         result.add(new Object[]{"agentUnknownParamForType", Messages.ModelValidatorImpl_InvalidAgentParameter("fruit", "otherField", "[label, otherField, nested]")});
         result.add(new Object[]{"notificationsSectionRemoved", "additional properties are not allowed"});
         result.add(new Object[]{"unknownWhenConditional", Messages.ModelValidatorImpl_UnknownWhenConditional("banana",
-                "allOf, anyOf, branch, environment, expression, not")});
+                "allOf, anyOf, branch, changelog, changeset, environment, expression, not")});
         result.add(new Object[]{"whenInvalidParameterType", Messages.ModelValidatorImpl_InvalidUnnamedParameterType("class java.lang.String", 4, Integer.class)});
         result.add(new Object[]{"whenMissingRequiredParameter", Messages.ModelValidatorImpl_MissingRequiredStepParameter("value")});
         result.add(new Object[]{"whenUnknownParameter", Messages.ModelValidatorImpl_InvalidStepParameter("banana", "name")});