Skip to content

Switch WorkflowRunRestartTest to JenkinsSessionRule #356

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jglick merged 2 commits into from
May 24, 2023
Merged

Switch WorkflowRunRestartTest to JenkinsSessionRule #356

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
45bab08
Switch `WorkflowRunRestartTest` to `JenkinsSessionRule`
jglick May 23, 2023
d014f58
Merge branch 'master' of https://github.com/jenkinsci/workflow-job-pl…
jglick May 24, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 20 additions & 19 deletions src/test/java/org/jenkinsci/plugins/workflow/job/WorkflowRunRestartTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,18 +61,19 @@
import org.junit.Test;
import org.jvnet.hudson.test.BuildWatcher;
import org.jvnet.hudson.test.Issue;
import org.jvnet.hudson.test.RestartableJenkinsRule;
import org.jvnet.hudson.test.JenkinsRule;
import org.jvnet.hudson.test.JenkinsSessionRule;
import org.jvnet.hudson.test.TestExtension;
import org.kohsuke.stapler.DataBoundConstructor;
import org.kohsuke.stapler.DataBoundSetter;

public class WorkflowRunRestartTest {

@ClassRule public static BuildWatcher buildWatcher = new BuildWatcher();
@Rule public RestartableJenkinsRule story = new RestartableJenkinsRule();
@Rule public JenkinsSessionRule story = new JenkinsSessionRule();

@Issue("JENKINS-27299")
@Test public void disabled() {
@Test public void disabled() throws Throwable {
story.then(r -> {
WorkflowJob p = r.jenkins.createProject(WorkflowJob.class, "p");
p.setDefinition(new CpsFlowDefinition("node {semaphore 'wait'}", true));
Expand All @@ -94,7 +95,7 @@ public class WorkflowRunRestartTest {
}

@Issue("JENKINS-33761")
@Test public void resumeDisabled() {
@Test public void resumeDisabled() throws Throwable {
story.then(r -> {
WorkflowJob p = r.jenkins.createProject(WorkflowJob.class, "p");
p.setDefinition(new CpsFlowDefinition("node {semaphore 'wait'}", true));
Expand All @@ -117,8 +118,8 @@ public class WorkflowRunRestartTest {
}

@Issue({"JENKINS-45585", "JENKINS-50784"}) // Verifies execution lazy-load
@Test public void lazyLoadExecution() {
story.thenWithHardShutdown(r -> {
Copy link
Member Author

@jglick jglick May 23, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This method does not exist in JenkinsSessionRule. Rarely needed; no apparent reason for it to have been added in #93.

Copy link
Member Author

@jglick jglick May 23, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

…but need to revisit 18d78f3 from #27.

Copy link
Member Author

@jglick jglick May 23, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah, have it. thenWithHardShutdown blocks FlowExecutionList.saveAll, and unregister saves asynchronously, so after a restart an attempt is made to load this supposedly running build and WorkflowRun.getExecution is called, which can cause the test to fail. Switching to then fixes this, as does simply sleeping momentarily.

@Test public void lazyLoadExecution() throws Throwable {
story.then(r -> {
WorkflowJob p = r.jenkins.createProject(WorkflowJob.class, "p");
p.addProperty(new DurabilityHintJobProperty(FlowDurabilityHint.MAX_SURVIVABILITY));
p.setDefinition(new CpsFlowDefinition("echo 'dosomething'", true));
Expand Down Expand Up @@ -160,7 +161,7 @@ public class WorkflowRunRestartTest {
}

@Issue("JENKINS-25550")
@Test public void hardKill() {
@Test public void hardKill() throws Throwable {
story.then(r -> {
WorkflowJob p = r.jenkins.createProject(WorkflowJob.class, "p");
p.addProperty( new DurabilityHintJobProperty(FlowDurabilityHint.MAX_SURVIVABILITY));
Expand Down Expand Up @@ -191,7 +192,7 @@ public class WorkflowRunRestartTest {
}

@Issue("JENKINS-33721")
@Test public void termAndKillInSidePanel() {
@Test public void termAndKillInSidePanel() throws Throwable {
story.then(r -> {
WorkflowJob p = r.jenkins.createProject(WorkflowJob.class, "p");
p.setDefinition(new CpsFlowDefinition("def seq = 0; while (true) {try {zombie id: ++seq} catch (x) {echo(/ignoring $x/)}}", true));
Expand All @@ -203,16 +204,16 @@ public class WorkflowRunRestartTest {
r.waitForMessage("[1] bwahaha FlowInterruptedException #1", b);
ex.interrupt();
r.waitForMessage("[1] bwahaha FlowInterruptedException #2", b);
assertFalse(hasTermOrKillLink(b, "term"));
assertFalse(hasTermOrKillLink(b, "kill"));
assertFalse(hasTermOrKillLink(r, b, "term"));
assertFalse(hasTermOrKillLink(r, b, "kill"));
r.waitForMessage("Click here to forcibly terminate running steps", b);
assertTrue(hasTermOrKillLink(b, "term"));
assertFalse(hasTermOrKillLink(b, "kill"));
assertTrue(hasTermOrKillLink(r, b, "term"));
assertFalse(hasTermOrKillLink(r, b, "kill"));
b.doTerm();
r.waitForMessage("[2] undead", b);
r.waitForMessage("Click here to forcibly kill entire build", b);
assertTrue(hasTermOrKillLink(b, "term"));
assertTrue(hasTermOrKillLink(b, "kill"));
assertTrue(hasTermOrKillLink(r, b, "term"));
assertTrue(hasTermOrKillLink(r, b, "kill"));
b.doKill();
r.waitForMessage("Hard kill!", b);
r.waitForCompletion(b);
Expand All @@ -222,7 +223,7 @@ public class WorkflowRunRestartTest {
}

@Issue("JENKINS-46961")
@Test public void interruptedWhileStartingMaxSurvivability() {
@Test public void interruptedWhileStartingMaxSurvivability() throws Throwable {
story.then(r -> {
Assume.assumeThat("import from LibraryDecorator will not resolve in PCT", r.jenkins.pluginManager.getPlugin("workflow-cps-global-lib"), nullValue());
WorkflowJob p = r.createProject(WorkflowJob.class, "p");
Expand All @@ -247,7 +248,7 @@ public class WorkflowRunRestartTest {
}

@Issue("JENKINS-46961")
@Test public void interruptedWhileStartingPerformanceOptimized() {
@Test public void interruptedWhileStartingPerformanceOptimized() throws Throwable {
story.then(r -> {
Assume.assumeThat("import from LibraryDecorator will not resolve in PCT", r.jenkins.pluginManager.getPlugin("workflow-cps-global-lib"), nullValue());
WorkflowJob p = r.createProject(WorkflowJob.class, "p");
Expand All @@ -272,8 +273,8 @@ public class WorkflowRunRestartTest {
});
}

private boolean hasTermOrKillLink(WorkflowRun b, String termOrKill) throws Exception {
return !story.j.createWebClient().getPage(b)
private boolean hasTermOrKillLink(JenkinsRule r, WorkflowRun b, String termOrKill) throws Exception {
return !r.createWebClient().getPage(b)
.getByXPath("//a[@href = '#' and contains(@data-url, '/" + b.getUrl() + termOrKill + "')]").isEmpty();
}

Expand Down Expand Up @@ -316,7 +317,7 @@ private static class Execution extends StepExecution {

@Issue("JENKINS-43055")
@Test
public void flowExecutionListener() {
public void flowExecutionListener() throws Throwable {
story.then(r -> {
WorkflowJob p = r.jenkins.createProject(WorkflowJob.class, "p");
p.setDefinition(new CpsFlowDefinition("echo 'Running for listener'\n" +
Expand Down