From 0a6bca5c64a28abd26d1b21f0e76f22fb95c328e Mon Sep 17 00:00:00 2001 From: Jesse Glick Date: Wed, 15 Feb 2023 18:09:40 -0500 Subject: [PATCH] More clearly noting when https://github.com/jenkinsci/jenkins/pull/7599 was merged --- .../plugins/workflow/support/steps/ExecutorStepExecution.java | 2 +- .../plugins/workflow/support/steps/ExecutorStepTest.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/jenkinsci/plugins/workflow/support/steps/ExecutorStepExecution.java b/src/main/java/org/jenkinsci/plugins/workflow/support/steps/ExecutorStepExecution.java index 72ee4d98..7a53679c 100644 --- a/src/main/java/org/jenkinsci/plugins/workflow/support/steps/ExecutorStepExecution.java +++ b/src/main/java/org/jenkinsci/plugins/workflow/support/steps/ExecutorStepExecution.java @@ -569,7 +569,7 @@ public String getShortDescription() { return r; } - // TODO https://github.com/jenkinsci/jenkins/pull/7599 @Override + // TODO 2.389+ @Override public @CheckForNull Queue.Executable getOwnerExecutable() { Run r = runForDisplay(); return r instanceof Queue.Executable ? (Queue.Executable) r : null; diff --git a/src/test/java/org/jenkinsci/plugins/workflow/support/steps/ExecutorStepTest.java b/src/test/java/org/jenkinsci/plugins/workflow/support/steps/ExecutorStepTest.java index 43c19f3a..25d29f17 100644 --- a/src/test/java/org/jenkinsci/plugins/workflow/support/steps/ExecutorStepTest.java +++ b/src/test/java/org/jenkinsci/plugins/workflow/support/steps/ExecutorStepTest.java @@ -613,7 +613,7 @@ private static void assertLogMatches(WorkflowRun build, String regexp) throws IO Queue.Item[] items = Queue.getInstance().getItems(); assertEquals(1, items.length); assertEquals(p, items[0].task.getOwnerTask()); - // // TODO https://github.com/jenkinsci/jenkins/pull/7599 remove cast + // // TODO 2.389+ remove cast assertEquals(b, ((ExecutorStepExecution.PlaceholderTask) items[0].task).getOwnerExecutable()); assertEquals(items[0], QueueItemAction.getQueueItem(executorStartNode));