Skip to content
Permalink
Browse files

Building and thus testing against 1.456.

Former testParameterExpansion failed against 1.456+ at least because the fix of JENKINS-9118
upgraded Ant and thus caused <echoproperties> to properly escape output.
Also it seems the project name was added to $BUILD_TAG in some undetermined version.
  • Loading branch information
jglick committed Jan 9, 2013
1 parent c05b8f4 commit 567243149d9f39e87ab6264e0e227c2c1bbd5502
Showing with 2 additions and 2 deletions.
  1. +1 −1 pom.xml
  2. +1 −1 src/test/java/hudson/tasks/AntTest.java
@@ -3,7 +3,7 @@
<parent>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>plugin</artifactId>
<version>1.431</version>
<version>1.456</version>
</parent>

<artifactId>ant</artifactId>
@@ -150,7 +150,7 @@ public void testParameterExpansion() throws Exception {
// Odd build tag, but it's constructed with getParent().getName() and the parent is the
// matrix configuration, not the project.. if matrix build tag ever changes, update
// expected value here:
assertTrue("Missing $BUILD_TAG: " + log, log.contains("vTAG=jenkins-AX=is-1"));
assertTrue("Missing $BUILD_TAG: " + log, log.contains("vTAG=jenkins-test project-AX\\=is-1"));
assertTrue("Missing $EXECUTOR_NUMBER: " + log, log.matches("(?s).*vEXEC=\\d.*"));
// $NODE_NAME is expected to be empty when running on master.. not checking.
assertTrue("Missing $NODE_LABELS: " + log, log.contains("vLAB=master"));

0 comments on commit 5672431

Please sign in to comment.
You can’t perform that action at this time.