Skip to content
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

Jump to bottom

Handle failures in sh step with returnStdout #329

Merged
merged 2 commits into from
Jan 28, 2021
Merged

Handle failures in sh step with returnStdout #329

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e883520
Handle failures in sh step with returnStdout
nre-ableton Jan 4, 2021
506173c
Print sh output on failure when returnStatus: true
nre-ableton Jan 4, 2021
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
5 changes: 3 additions & 2 deletions src/main/groovy/com/lesfurets/jenkins/unit/PipelineTestHelper.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -683,11 +683,12 @@ class PipelineTestHelper {
exitValue = output.exitValue
}

if (!returnStdout) {
// Jenkins also prints the output from sh when returnStdout is true if the script fails
if (!returnStdout || exitValue != 0) {
println stdout
}

if (returnStdout) {
if (returnStdout && exitValue == 0) {
nre-ableton marked this conversation as resolved.
Show resolved Hide resolved
return stdout
}
if (returnStatus) {
Expand Down
12 changes: 12 additions & 0 deletions src/test/groovy/com/lesfurets/jenkins/unit/PipelineTestHelperTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,18 @@ class PipelineTestHelperTest {
Assertions.assertThat(output).isEqualTo('/foo/bar')
}

@Test(expected = Exception)
void runShWithStdoutFailure() {
// given:
def helper = new PipelineTestHelper()
helper.addShMock('pwd', '/foo/bar', 1)

// when:
helper.runSh(returnStdout: true, script: 'pwd')

// then: Exception raised
}

@Test
void runShWithReturnCode() {
// given:
Expand Down