Skip to content

Commit 05014d2

Browse files
authored
Replace tasty-ant-xml with tasty-test-reporter (#1809)
* Replace tasty-ant-xml with tasty-test-reporter tasty-test-reporter displays failing tests better in the console and can display test failures in the CI logs while simultaneously producing a Jenkins XML report. * Jenkinsfile: Stricter timeouts
1 parent 14a7f15 commit 05014d2

File tree

5 files changed

+25
-4
lines changed

5 files changed

+25
-4
lines changed

Jenkinsfile

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,9 @@ pipeline {
4242
}
4343
}
4444
stage('Unit Tests') {
45+
options {
46+
timeout(time: 24, unit: 'MINUTES')
47+
}
4548
steps {
4649
sh '''
4750
./scripts/unit-test.sh
@@ -55,7 +58,7 @@ pipeline {
5558
}
5659
stage('Integration Tests') {
5760
options {
58-
timeout(time: 32, unit: 'MINUTES')
61+
timeout(time: 24, unit: 'MINUTES')
5962
}
6063
steps {
6164
sh '''

kore/package.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -215,11 +215,11 @@ tests:
215215
- hedgehog >=1.0
216216
- quickcheck-instances >=0.3
217217
- tasty >=1.2
218-
- tasty-ant-xml >=1.1
219-
- tasty-hedgehog >=1.0
220218
- tasty-golden >=2.3
221219
- tasty-hunit >=0.10
220+
- tasty-hedgehog >=1.0
222221
- tasty-quickcheck >=0.10
222+
- tasty-test-reporter >=0.1
223223
- template-haskell >=2.14
224224
- temporary >=1.3
225225
<<: *common-exe

kore/test/Driver.hs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
{-# OPTIONS_GHC -F -pgmF tasty-discover -optF --tree-display -optF --hide-successes -optF --ingredient=Test.Tasty.Runners.consoleTestReporter -optF --ingredient=Test.Tasty.Runners.listingTests -optF --ingredient=Test.Tasty.Runners.AntXML.antXMLRunner -optF --generated-module=Driver #-}
1+
{-# OPTIONS_GHC -F -pgmF tasty-discover -optF --tree-display -optF --hide-successes -optF --ingredient=Test.Tasty.Runners.Reporter.ingredient -optF --ingredient=Test.Tasty.Runners.listingTests -optF --generated-module=Driver #-}
22

33
{- |
44

stack.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,13 @@ packages:
4848
# (e.g., acme-missiles-0.3)
4949
extra-deps:
5050
- ghc-trace-events-0.0.0.1@sha256:cef5cffd2d749b07ba948b27970c45b6e96705575853f9c14719ad2b9b3397e2
51+
5152
- witherable-0.3.5@sha256:6590a15735b50ac14dcc138d4265ff1585d5f3e9d3047d5ebc5abf4cd5f50084,1476
5253
- witherable-class-0@sha256:91f05518f9f4af5b02424f13ee7dcdab5d6618e01346aa2f388a72ff93e2e501,775
5354

55+
- tasty-test-reporter-0.1.1.1@sha256:e34ea27f5a8f6673de2952c29799da243adb2246b1912a207e903caa9a9dbe34,1779
56+
- junit-xml-0.1.0.0@sha256:5da18fe01fdb2e32904499ad67f32229a1df4bd4422483dd4a26090aeaf5de0d,1417
57+
5458
# TODO (thomas.tuegel): Remove this when stylish-haskell is updated upstream.
5559
allow-newer: true
5660

stack.yaml.lock

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,20 @@ packages:
2525
sha256: e99696bf95da593a3892c7b9a28db09ffd139b4b1b313f32cec9d26979aa7ce2
2626
original:
2727
hackage: witherable-class-0@sha256:91f05518f9f4af5b02424f13ee7dcdab5d6618e01346aa2f388a72ff93e2e501,775
28+
- completed:
29+
hackage: tasty-test-reporter-0.1.1.1@sha256:e34ea27f5a8f6673de2952c29799da243adb2246b1912a207e903caa9a9dbe34,1779
30+
pantry-tree:
31+
size: 410
32+
sha256: e3897d9fc739f589ec76f5c94adfdca8e88434c8731aa27a75bfdd61d5d547cb
33+
original:
34+
hackage: tasty-test-reporter-0.1.1.1@sha256:e34ea27f5a8f6673de2952c29799da243adb2246b1912a207e903caa9a9dbe34,1779
35+
- completed:
36+
hackage: junit-xml-0.1.0.0@sha256:5da18fe01fdb2e32904499ad67f32229a1df4bd4422483dd4a26090aeaf5de0d,1417
37+
pantry-tree:
38+
size: 384
39+
sha256: c21b8b22bbbebb15a8d6babb7efbf3d31045ca2f1763d7fc2c44e99d180a1a59
40+
original:
41+
hackage: junit-xml-0.1.0.0@sha256:5da18fe01fdb2e32904499ad67f32229a1df4bd4422483dd4a26090aeaf5de0d,1417
2842
snapshots:
2943
- completed:
3044
size: 524996

0 commit comments

Comments
 (0)