JENKINS-27593: Do not try to export test results for canceled or brok…

…en builds Task-Url: https://issues.jenkins-ci.org/browse/JENKINS-27593
jenkinsci · Mar 25, 2015 · 6048cb4 · 6048cb4
1 parent 8fd406f
commit 6048cb4
Showing 1 changed file with 48 additions and 36 deletions.
diff --git a/src/main/java/hudson/plugins/klaros/KlarosTestResultPublisher.java b/src/main/java/hudson/plugins/klaros/KlarosTestResultPublisher.java
@@ -360,47 +360,59 @@ public boolean perform(final AbstractBuild<?, ?> build, final Launcher launcher,
             final BuildListener listener) {
 
         boolean result = false;
+        if (Result.SUCCESS.equals(build.getResult())
+                || Result.UNSTABLE.equals(build.getResult())) {
+
+            FilePath ws = build.getWorkspace();
+            if (ws == null) {
+                listener.error("No workspace defined!");
+                build.setResult(Result.FAILURE);
+                result = false;
+            } else {
+                for (ResultSet resultSet : getResultSets()) {
+                    if (StringUtils.isEmpty(resultSet.getSpec())) {
+                        listener.getLogger().println(
+                                "Empty result spec implementation detected");
+                    } else {
+                        listener.getLogger().println(
+                                "The test result(s) contained in target "
+                                        + resultSet.getSpec()
+                                        + " will be exported to the "
+                                        + "Klaros-Testmanagement Server at "
+                                        + getUrl(url) + ".");
+                        listener.getLogger().println(
+                                "With parameters Project[" + config + "], Environment["
+                                        + env + "], SUT[" + sut + "] and Type[" + type
+                                        + "].");
+
+                        try {
+                            FileCallableImplementation exporter = new FileCallableImplementation(
+                                    listener);
+                            exporter.setKlarosUrl(getKlarosUrl(url));
+                            exporter.setResultSet(resultSet);
+                            ws.act(exporter);
+
+                        } catch (IOException e) {
+                            listener.getLogger().println(
+                                    "Failure to export test result(s).");
+                            e.printStackTrace(listener.getLogger());
+                        } catch (InterruptedException e) {
+                            listener.getLogger().println(
+                                    "Failure to export test result(s).");
+                            e.printStackTrace(listener.getLogger());
+                        }
 
-        FilePath ws = build.getWorkspace();
-        if (ws == null) {
-            listener.error("No workspace defined!");
-            build.setResult(Result.FAILURE);
-            result = false;
-        } else {
-            for (ResultSet resultSet : getResultSets()) {
-                if (StringUtils.isEmpty(resultSet.getSpec())) {
-                    listener.getLogger().println(
-                            "Empty result spec implementation detected");
-                } else {
-                    listener.getLogger().println(
-                            "The test result(s) contained in target "
-                                    + resultSet.getSpec() + " will be exported to the "
-                                    + "Klaros-Testmanagement Server at " + getUrl(url)
-                                    + ".");
-                    listener.getLogger().println(
-                            "With parameters Project[" + config + "], Environment[" + env
-                                    + "], SUT[" + sut + "] and Type[" + type + "].");
+                        listener.getLogger().println(
+                                "Test result(s) successfully exported.");
 
-                    try {
-                        FileCallableImplementation exporter = new FileCallableImplementation(
-                                listener);
-                        exporter.setKlarosUrl(getKlarosUrl(url));
-                        exporter.setResultSet(resultSet);
-                        ws.act(exporter);
-
-                    } catch (IOException e) {
-                        listener.getLogger().println("Failure to export test result(s).");
-                        e.printStackTrace(listener.getLogger());
-                    } catch (InterruptedException e) {
-                        listener.getLogger().println("Failure to export test result(s).");
-                        e.printStackTrace(listener.getLogger());
+                        result = true;
                     }
-
-                    listener.getLogger().println("Test result(s) successfully exported.");
-
-                    result = true;
                 }
             }
+        } else {
+            listener.getLogger().println(
+                    "Skipping export of test results to Klaros-Testmangement due to build status");
+            result = true;
         }
         return result;
     }