Merge pull request #612 from jglick/NodeExecutorsTest

Relax assertion in `NodeExecutorsTest`
jenkinsci · Jan 14, 2025 · 4dd2021 · 4dd2021
2 parents 6479d73 + 0dfd600
commit 4dd2021
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/src/test/java/com/cloudbees/jenkins/support/impl/NodeExecutorsTest.java b/src/test/java/com/cloudbees/jenkins/support/impl/NodeExecutorsTest.java
@@ -124,9 +124,13 @@ public void addContentsRunningBuild() throws Exception {
         assertTrue(Pattern.compile("- currentWorkUnit:.*" + workflowRun.getFullDisplayName() + ".*")
                 .matcher(scanner.nextLine())
                 .find());
-        assertTrue(Pattern.compile("- executable:.*" + workflowRun.getFullDisplayName() + ".*")
-                .matcher(scanner.nextLine())
-                .find());
+        assertTrue(
+                executorMd,
+                Pattern.compile("- executable:.*(" + workflowRun.getExternalizableId()
+                                + /* TODO delete after https://github.com/jenkinsci/workflow-job-plugin/pull/499 */ "|"
+                                + workflowRun.getFullDisplayName() + ").*")
+                        .matcher(scanner.nextLine())
+                        .find());
         assertTrue(scanner.nextLine().contains("- elapsedTime: "));
         assertFalse(scanner.hasNextLine());
         scanner.close();