[tor-commits] [chutney/master] Travis: Actually allow 2 failures per test

[teor at torproject.org]

commit 7c945cc2bcaaec2a04e8cc561c6f460cfa44d633
Author: teor <teor at torproject.org>
Date:   Fri Mar 13 13:12:00 2020 +1000

    Travis: Actually allow 2 failures per test
    
    Previously, the script reset the number of failures to 1.
    
    Fix on 33583.
---
 .travis.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index dcb65fd..ff8f540 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -16,6 +16,8 @@ env:
     ## triggered by Ubuntu Xenial and Bionic. See #32722.
     - CHUTNEY_TOR_SANDBOX="0"
     ## Tolerate a small number of failures in chutney jobs
+    ## Tor 0.3.5 seems particularly unstable, later versions seem to cope well
+    ## with CHUTNEY_ALLOW_FAILURES="1"
     - CHUTNEY_ALLOW_FAILURES="2"
   matrix:
     ## This matrix entry is required, but it doesn't actually create any jobs
@@ -262,10 +264,8 @@ script:
   ## Basic tests
   - if command -v shellcheck ; then tests/shellcheck-tests.sh; fi
   - tests/unit-tests.sh
-  ## Quick smoke test
-  - tools/test-network.sh --dry-run
-  ## Now, allow one failure for each test (--allow-failures 1)
-  - export CHUTNEY_ALLOW_FAILURES=1
+  ## Quick smoke test, don't allow failures
+  - CHUTNEY_ALLOW_FAILURES=0 tools/test-network.sh --dry-run
   ## Different data directory
   - tools/test-network.sh --net-dir "$(mktemp -d)"
   ## IP address handling