Skip to content
Permalink
Browse files

Merge pull request #180 from abayer/jenkins-46112

[JENKINS-46112] Test demonstrating that error steps get log actions now
  • Loading branch information
abayer committed Aug 17, 2017
2 parents e2f8993 + 77ec337 commit 83d002b6f28490591489173259acd4578a01161a
@@ -45,8 +45,10 @@
import org.jenkinsci.plugins.pipeline.modeldefinition.ast.ModelASTStep;
import org.jenkinsci.plugins.pipeline.modeldefinition.ast.ModelASTTreeStep;
import org.jenkinsci.plugins.pipeline.modeldefinition.ast.ModelASTValue;
import org.jenkinsci.plugins.workflow.actions.LogAction;
import org.jenkinsci.plugins.workflow.actions.TagsAction;
import org.jenkinsci.plugins.workflow.actions.ThreadNameAction;
import org.jenkinsci.plugins.workflow.cps.nodes.StepAtomNode;
import org.jenkinsci.plugins.workflow.cps.nodes.StepStartNode;
import org.jenkinsci.plugins.workflow.flow.FlowExecution;
import org.jenkinsci.plugins.workflow.graph.BlockStartNode;
@@ -60,6 +62,7 @@
import org.jenkinsci.plugins.workflow.libs.SCMSourceRetriever;
import org.jenkinsci.plugins.workflow.pipelinegraphanalysis.GenericStatus;
import org.jenkinsci.plugins.workflow.pipelinegraphanalysis.StatusAndTiming;
import org.jenkinsci.plugins.workflow.steps.ErrorStep;
import org.junit.BeforeClass;
import org.junit.Test;
import org.jvnet.hudson.test.Issue;
@@ -961,6 +964,27 @@ public void parallelStagesAgentEnvWhen() throws Exception {

}

@Issue("JENKINS-46112")
@Test
public void logActionPresentForError() throws Exception {
WorkflowRun r = expect(Result.FAILURE, "logActionPresentForError").go();
FlowExecution execution = r.getExecution();

Collection<FlowNode> heads = execution.getCurrentHeads();

DepthFirstScanner scanner = new DepthFirstScanner();

FlowNode n = scanner.findFirstMatch(heads, null, new Predicate<FlowNode>() {
@Override
public boolean apply(FlowNode input) {
return input instanceof StepAtomNode && ((StepAtomNode) input).getDescriptor() instanceof ErrorStep.DescriptorImpl;
}
});

LogAction l = n.getAction(LogAction.class);
assertNotNull(l);
}

@Test
public void mapCallsWithMethodCallValues() throws Exception {
WorkflowRun b = expect("mapCallsWithMethodCallValues")
@@ -0,0 +1,36 @@
/*
* The MIT License
*
* Copyright (c) 2017, CloudBees, Inc.
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
pipeline {
agent none
environment {
EXAMPLE_VARIABLE = 'This is an example variable'
}
stages {
stage('Error Example') {
steps {
error "This is an error example using declarative pipeline"
}
}
}
}

0 comments on commit 83d002b

Please sign in to comment.
You can’t perform that action at this time.