diff options
| author | Bryan Drewery <bryan@shatow.net> | 2019-08-03 20:13:46 +0300 |
|---|---|---|
| committer | Bryan Drewery <bryan@shatow.net> | 2019-08-03 20:17:54 +0300 |
| commit | 55f3f967c54f65179c206aa645da15fe8e043833 (patch) | |
| tree | 7b37788b93d4478237f717668ca2614dc6468124 /test | |
| parent | 5d6aef4b8fde76a3d69090898ecee9ba7a736a94 (diff) | |
IGNORE: Restore old accounting method for skipped/ignored.
Because skipped is both pre- and post- build now it needs to still
be accounted for in the queued stat. There are also backwards-compat
problems with the html interface. Just revert to the old
accounting method to resolve the issue.
Revert "Tobuild should account for ignored/skipped being trimmed out of queued"
This reverts commit 383f6f2ab47df89cb746e132c4ba891af1d435cb.
Revert "IGNORE: Don't count trimmed ignored/skipped ports as part of the queued count."
This reverts commit 1fd1aa73ef592d384cae1a5fd006f915507daabc.
Diffstat (limited to 'test')
| -rw-r--r-- | test/common.bulk.sh | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/test/common.bulk.sh b/test/common.bulk.sh index d2777a6a..59469b04 100644 --- a/test/common.bulk.sh +++ b/test/common.bulk.sh @@ -336,6 +336,7 @@ assert_counts() { expected_skipped=$(echo "${SKIPPEDPORTS}" | tr ' ' '\n' | wc -l) expected_skipped="${expected_skipped##* }" fi + expected_queued=$((expected_queued + expected_ignored + expected_skipped)) echo "=> Asserting queued=${expected_queued} ignored=${expected_ignored} skipped=${expected_skipped}" read queued < "${log}/.poudriere.stats_queued" |