FIX: parse Taurus tool parameters (#166)

* FIX: parse Taurus tool parameters * update dependecy * update code
jenkinsci · May 14, 2018 · 8e0733d · 8e0733d
1 parent 2c906d1
commit 8e0733d
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 7 deletions.
diff --git a/docs/Changelog.md b/docs/Changelog.md
@@ -1,6 +1,9 @@
 <small>[<< Back to main page](./)</small>
 # Changelog 
 
+## v3.8 (upcoming)
+- FIX: parse Taurus tool parameters;
+
 ## v3.7 (6th of April, 2018)
 - ADD: charts to `Performace report` page
 - FIX: relative constraint failure on first build. Contributed by [Till Neunast](https://github.com/tilln)

diff --git a/pom.xml b/pom.xml
@@ -53,6 +53,13 @@
     </pluginRepositories>
 
     <dependencies>
+        <dependency>
+            <groupId>org.codehaus.plexus</groupId>
+            <artifactId>plexus-utils</artifactId>
+            <version>3.1.0</version>
+        </dependency>
+
+
         <dependency>
             <groupId>org.easymock</groupId>
             <artifactId>easymockclassextension</artifactId>

diff --git a/src/main/java/hudson/plugins/performance/build/PerformanceTestBuild.java b/src/main/java/hudson/plugins/performance/build/PerformanceTestBuild.java
@@ -18,6 +18,7 @@
 import hudson.tasks.Builder;
 import jenkins.tasks.SimpleBuildStep;
 import org.apache.commons.io.output.NullOutputStream;
+import org.codehaus.plexus.util.cli.CommandLineUtils;
 import org.jenkinsci.Symbol;
 import org.kohsuke.stapler.DataBoundConstructor;
 import org.kohsuke.stapler.DataBoundSetter;
@@ -34,8 +35,6 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
 
 /**
  * "Build step" for running performance test
@@ -293,9 +292,16 @@ private int runPerformanceTest(FilePath bztWorkingDirectory, FilePath workspace,
         final List<String> testCommand = new ArrayList<>();
 
         testCommand.add((isVirtualenvInstallation ? getVirtualenvPath(workspace) : "") + PERFORMANCE_TEST_COMMAND);
-        Matcher m = Pattern.compile("([^\']\\S*|\'.+?\')\\s*").matcher(this.params);
-        while (m.find()) {
-            String param = m.group(1);
+        String[] parsedParams;
+        try {
+            parsedParams = CommandLineUtils.translateCommandline(envVars.expand(this.params));
+        } catch (Exception e) {
+            logger.println("Failed parse Taurus parameters");
+            e.printStackTrace(logger);
+            return 1;
+        }
+
+        for (String param : parsedParams) {
             if (!param.isEmpty()) {
                 testCommand.add(param);
             }

diff --git a/src/test/java/hudson/plugins/performance/PerformancePipelineTest.java b/src/test/java/hudson/plugins/performance/PerformancePipelineTest.java
@@ -37,13 +37,14 @@ public void evaluate() throws Throwable {
                         "-o \\'reporting.-1={module: \"junit-xml\", filename: \"report.xml\"}\\' " +
                         "-o \\'execution.0.scenario.requests.1={url: \"http://blazedemo.com/\": assert: [\"yo mamma\"]}\\'";
                 p.setDefinition(new CpsFlowDefinition(
-                        "node('master'){ bzt(params: '" + bztParams + "', useSystemSitePackages: false, printDebugOutput: true, bztVersion: '1.9.1') }", true));
+                        "node('master'){ bzt(params: '" + bztParams + "', useSystemSitePackages: false, printDebugOutput: true, bztVersion: '1.10.5') }", true));
                 WorkflowRun r = p.scheduleBuild2(0).waitForStart();
                 story.j.assertBuildStatusSuccess(story.j.waitForCompletion(r));
+                story.j.assertLogContains("Writing JUnit XML report into: report.xml", r);
                 story.j.assertLogContains("File aggregate-results.xml reported", r);
                 story.j.assertLogContains("of errors [SUCCESS].", r);
                 if (JenkinsRule.getLog(r).contains("Performance test: Installing bzt into 'taurus-venv'")) {
-                    story.j.assertLogContains("Taurus CLI Tool v1.9.1", r);
+                    story.j.assertLogContains("Taurus CLI Tool v1.10.5", r);
                 }
             }
         });