Skip to content

Commit 7fd836c

Browse files
committed
Make integration test 'custom-properties' more robust
1 parent 712b5aa commit 7fd836c

2 files changed

Lines changed: 5 additions & 3 deletions

File tree

src/it/custom-properties/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
<configuration>
2626
<tstampFormat>yyyy-MM-dd</tstampFormat>
2727
<customProperties>
28-
{ :build-tag-lowercase (clojure.string/lower-case build-tag) }
28+
{ :build-commit-uppercase (clojure.string/upper-case build-commit) }
2929
</customProperties>
3030
</configuration>
3131
</execution>

src/it/custom-properties/verify.groovy

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,9 @@ def build_log = new File("target/it/custom-properties/build.log").text
66

77
boolean tstamp = (build_log =~ /build-tstamp: \d\d\d\d-\d\d-\d\d/)
88

9-
boolean customLowerCaseProperty = ( build_log =~ /build-tag-lowercase: n\/a/ )
109

11-
return tstamp && customLowerCaseProperty
10+
// expect an all-uppercased git commit hash
11+
boolean customProperty = ( build_log =~ /build-commit-uppercase: [0-9A-F]{40}/ )
12+
13+
return tstamp && customProperty
1214

0 commit comments

Comments
 (0)