Merge remote-tracking branch 'origin/master' into JENKINS-51454

jenkinsci · Aug 14, 2021 · 976f7a9 · 976f7a9
2 parents 21b4d3e + 12816c1
commit 976f7a9
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/src/test/java/org/jenkinsci/plugins/workflow/support/steps/stash/StashTest.java b/src/test/java/org/jenkinsci/plugins/workflow/support/steps/stash/StashTest.java
@@ -73,7 +73,9 @@ public class StashTest {
  SemaphoreStep.success("ending/1", null);
  r.assertBuildStatusSuccess(r.waitForCompletion(b));
  r.assertLogContains("got fname: whatever other: more", b);
- assertEquals("{}", StashManager.stashesOf(b).toString()); // TODO flake expected:<{[]}> but was:<{[from-top={elsewhere/fname=whatever}, whatever={fname=whatever, other=more}]}>
+ while (!StashManager.stashesOf(b).isEmpty()) {
+ Thread.sleep(100);
+ }
  }
 
  @Issue("JENKINS-31086")
@@ -114,7 +116,9 @@ public class StashTest {
  SemaphoreStep.success("ending/1", null);
  r.assertBuildStatusSuccess(r.waitForCompletion(b));
  r.assertLogContains("Stashed 0 file(s)", b);
- assertEquals("{}", StashManager.stashesOf(b).toString());
+ while (!StashManager.stashesOf(b).isEmpty()) {
+ Thread.sleep(100);
+ }
  List<FlowNode> coreStepNodes = new DepthFirstScanner().filteredNodes(b.getExecution(), new NodeStepTypePredicate("stash"));
  assertThat(coreStepNodes, Matchers.hasSize(1));
  assertEquals("whatever", ArgumentsAction.getStepArgumentsAsString(coreStepNodes.get(0)));