Merge pull request #404 from jglick/WorkflowRun.saveWithoutFailing

Adapt to workflow-job-plugin#357
jenkinsci · May 24, 2023 · f129d48 · f129d48
2 parents b8c98c6 + b3a838e
commit f129d48
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/src/test/java/io/jenkins/plugins/artifact_manager_jclouds/NetworkTest.java b/src/test/java/io/jenkins/plugins/artifact_manager_jclouds/NetworkTest.java
@@ -341,8 +341,11 @@ public void errorCleaningStashes() throws Exception {
         WorkflowJob p = r.createProject(WorkflowJob.class, "p");
         p.setDefinition(new CpsFlowDefinition("node('remote') {writeFile file: 'f', text: '.'; stash 'stuff'}", true));
         MockApiMetadata.handleRemoveBlob("container", "p/1/stashes/stuff.tgz", () -> {throw new ContainerNotFoundException("container", "sorry about your stashes");});
-        r.buildAndAssertSuccess(p);
-        expectLogMessage("container not found: sorry about your stashes");
+        WorkflowRun b = r.buildAndAssertSuccess(p);
+        if (!JenkinsRule.getLog(b).contains("container not found: sorry about your stashes")) {
+            // TODO delete after https://github.com/jenkinsci/workflow-job-plugin/pull/357
+            expectLogMessage("container not found: sorry about your stashes");
+        }
     }
 
     // Interrupts probably never delivered during HTTP requests (maybe depends on servlet container?).