Skip to content

Flowscanner reimplement jenkins28119 error info #3

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

Draft
svanoort wants to merge 4 commits into
base: master
Choose a base branch
from
Draft

Flowscanner reimplement jenkins28119 error info #3

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
cf118de
[JENKINS-25894] Pick up fix from https://github.com/jenkinsci/workflo…
jglick Apr 13, 2016
d8cf0e2
Sketch of ErrorInfoStep.
jglick Apr 13, 2016
81e422d
FindBugs
jglick Apr 13, 2016
5b5d33d
Use the new FlowScanner implementations for locating error/log info
svanoort Apr 27, 2016
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
Next Next commit
[JENKINS-25894] Pick up fix from jenkinsci/workflow-cps-plugin#6.
  • Loading branch information
@jglick
jglick committed Apr 13, 2016
commit cf118defbbfc7a1581b64cbbc668d6e3b07c337f
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@
<dependency>
<groupId>org.jenkins-ci.plugins.workflow</groupId>
<artifactId>workflow-cps</artifactId>
<version>1.15</version>
<version>2.2-SNAPSHOT</version>
Copy link
Member

@jglick jglick May 17, 2016

Choose a reason for hiding this comment

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

BTW this can now be switched to simply 2.2.

<scope>test</scope>
</dependency>
<dependency>
Expand Down
4 changes: 1 addition & 3 deletions src/test/java/org/jenkinsci/plugins/workflow/steps/TimeoutStepRunTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,6 @@
import org.jvnet.hudson.test.RestartableJenkinsRule;

import java.util.List;
import org.jenkinsci.plugins.workflow.steps.SleepStep;
import org.jenkinsci.plugins.workflow.steps.TimeoutStepExecution;

/**
* @author Kohsuke Kawaguchi
Expand Down Expand Up @@ -64,7 +62,7 @@ public void evaluate() throws Throwable {
+ " }\n"
+ " echo 'NotHere'\n"
+ "}\n"));
WorkflowRun b = story.j.assertBuildStatus(/* TODO JENKINS-25894 should really be ABORTED */Result.FAILURE, p.scheduleBuild2(0).get());
WorkflowRun b = story.j.assertBuildStatus(Result.ABORTED, p.scheduleBuild2(0).get());

// make sure things that are supposed to run do, and things that are NOT supposed to run do not.
story.j.assertLogNotContains("NotHere", b);
Expand Down