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 default return correctly when returnStatus is used #267

Merged
merged 3 commits into from
Aug 18, 2020
Merged

Handle default return correctly when returnStatus is used #267

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8f938d8
Handle default return correctly when returnStatus is used
Alex-Vol-SV Aug 17, 2020
8c5ea1c
Add unit test to verify default behavior with returnStatus
Alex-Vol-SV Aug 17, 2020
9a24bd0
Update src/main/groovy/com/lesfurets/jenkins/unit/PipelineTestHelper.…
Alex-Vol-SV Aug 18, 2020
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
4 changes: 4 additions & 0 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 @@ -633,6 +633,9 @@ class PipelineTestHelper {

MockScriptOutput output = mockScriptOutputs[script]
if (!output) {
if (returnStatus) {
return 0
}
// If no output is given, we return these strings for backwards-compatibility. Ideally at some point in the
// future, we should make a breaking change and remove this special use-case and either raise an exception
// here or return an empty string.
Expand Down Expand Up @@ -680,6 +683,7 @@ class PipelineTestHelper {
if (exitValue != 0) {
throw new Exception('Script returned error code: ' + exitValue)
}
return null
}

}
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 @@ -265,6 +265,18 @@ class PipelineTestHelperTest {
Assertions.assertThat(output).isEqualTo('\nbbb\nccc\n')
}

@Test()
void runShWithoutMockOutputAndReturnStatus() throws Exception {
// given:
def helper = new PipelineTestHelper()

// when:
def output = helper.runSh(returnStatus: true, script: 'unregistered-mock-output')

// then:
Assertions.assertThat(output).isEqualTo(0)
}

@Test()
void runShWithoutMockOutputForGitRevParse() throws Exception {
// given:
Expand Down