Rename txchecker-travis to txchecker-travis-required, move TWISTEDCHE…

…CKER_SKIP_WARNINGS setting to tox.ini. Add txchecker-travis-all as the allowed to fail target.
X3Y · Dec 7, 2016 · 33a8d53 · 33a8d53
1 parent e9a2bcc
commit 33a8d53
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -45,12 +45,11 @@ matrix:
     # Twistedchecker is running as a separate job so that we can ignore if it
     # fails.
     - python: 2.7
-      env:
-        - TOXENV=txchecker-travis
-        - TWISTEDCHECKER_SKIP_WARNINGS=W9208
-  allow_failures:
+      env: TOXENV=txchecker-travis-required
     - python: 2.7
-      env: TOXENV=txchecker-travis
+      env: TOXENV=txchecker-travis-all
+  allow_failures:
+    - env: TOXENV=txchecker-travis-all
 
 
 addons:

diff --git a/tox.ini b/tox.ini
@@ -78,6 +78,8 @@ setenv =
    # Help tests know where the base directory is.
    TOX_INI_DIR = {toxinidir}
 
+   txchecker-travis-required: TWISTEDCHECKER_SKIP_WARNINGS = W9208
+
 commands =
     ;
     ; Display information about Python interpreter
@@ -133,5 +135,7 @@ basepython=python2.7
 basepython=python2.7
 [testenv:manifest-checker]
 basepython=python2.7
-[testenv:txchecker-travis]
+[testenv:txchecker-travis-required]
+usedevelop=True
+[testenv:txchecker-travis-all]
 usedevelop=True