jenkins/sap-jenkins-library
1
0
Fork 0
mirror of https://github.com/SAP/jenkins-library.git synced 2025-01-18 05:18:24 +02:00
Code Issues Releases Activity

Merge pull request #512 from marcusholl/pr/unstashSkipNull

Browse Source 
Unstash in loop only if identifier is available
This commit is contained in:
Marcus Holl 2019-03-14 13:32:45 +01:00 committed by GitHub
commit 466cee5e1d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/com/sap/piper/Utils.groovy
View File

@ -55,6 +55,7 @@ def stashWithMessage(name, msg, include = '**/*.*', exclude = '') {
}
def unstash(name, msg = "Unstash failed:") {
def unstashedContent = []
try {
echo "Unstash content: ${name}"
@ -70,7 +71,9 @@ def unstashAll(stashContent) {
def unstashedContent = []
if (stashContent) {
for (i = 0; i < stashContent.size(); i++) {
unstashedContent += unstash(stashContent[i])
if(stashContent[i]) {
unstashedContent += unstash(stashContent[i])
}
}
}
return unstashedContent

8
test/groovy/com/sap/piper/UtilsTest.groovy
View File

@ -38,6 +38,7 @@ class UtilsTest extends BasePiperTest {
void setup() {
parameters = [:]
}
@Test
@ -70,4 +71,11 @@ class UtilsTest extends BasePiperTest {
// generated with "echo -n 'ContinuousDelivery' | sha1sum | sed 's/ -//'"
assertThat(result, is('0dad6c33b6246702132454f604dee80740f399ad'))
}
@Test
void testUnstashAllSkipNull() {
def stashResult = utils.unstashAll(['a', null, 'b'])
assert stashResult == ['a', 'b']
}
}