Commit 08d2782
authored
Fix metrics test and fix faulty CI (#420)
Just before releasing 1.0.0, I was looking at the running CI integration
tests action. Suddenly, I saw a test failing. **Yet then the CI run
succeeded**!
We discovered that the make recipe for running integration tests, which
is used by the CI, keeps running even if some earlier subcommand in that
recipe, including the main part of integration tests run under valgrind,
fails with a nonzero code.
The culprit was found to be `.ONESHELL` directive on top of the
Makefile, combined with lack of the `-e` option set in the run shells.
Adding `-e` option to `.SHELLFLAGS` fixed the issue.
The test (from MetricsTest) was failing due to recent change in Rust
Driver. Adjusting it was trivial.
## Pre-review checklist
<!--
Make sure you took care of the issues on the list.
Put 'x' into those boxes which apply.
You can also create the PR now and click on all relevant checkboxes.
-->
- [x] I have split my patch into logically separate commits.
- [x] All commit messages clearly explain what they change and why.
- [x] PR description sums up the changes and reasons why they should be
introduced.
- ~~[ ] I have implemented Rust unit tests for the features/changes
introduced.~~
- ~~[ ] I have enabled appropriate tests in `Makefile` in
`{SCYLLA,CASSANDRA}_(NO_VALGRIND_)TEST_FILTER`.~~
- ~~[ ] I added appropriate `Fixes:` annotations to PR description.~~2 files changed
Lines changed: 5 additions & 6 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
3 | 3 | | |
4 | 4 | | |
5 | 5 | | |
| 6 | + | |
6 | 7 | | |
7 | 8 | | |
8 | | - | |
| 9 | + | |
9 | 10 | | |
10 | 11 | | |
11 | 12 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
47 | 47 | | |
48 | 48 | | |
49 | 49 | | |
50 | | - | |
51 | | - | |
52 | 50 | | |
53 | | - | |
| 51 | + | |
54 | 52 | | |
55 | 53 | | |
56 | 54 | | |
57 | | - | |
| 55 | + | |
58 | 56 | | |
59 | 57 | | |
60 | 58 | | |
61 | | - | |
| 59 | + | |
62 | 60 | | |
63 | 61 | | |
64 | 62 | | |
| |||
0 commit comments