Merge pull request #2161 from nicoddemus/silence-trial-on-ci

Allow trial environments to fail on CI for now
pytest-dev · Dec 28, 2016 · 7d25940 · 7d25940
2 parents 088b742 + f7a1d36
commit 7d25940
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/.travis.yml b/.travis.yml
@@ -30,7 +30,8 @@ env:
 
 matrix:
  allow_failures:
- # py35-trial failing on Linux: #1989
+ # see #1989
+ - env: TESTENV=py27-trial
  - env: TESTENV=py35-trial
 
 script: tox --recreate -e $TESTENV

diff --git a/appveyor.yml b/appveyor.yml
@@ -27,6 +27,12 @@ environment:
  - TOXENV: "freeze"
  - TOXENV: "docs"
 
+matrix:
+ allow_failures:
+ # see #1989
+ - TOXENV: "py27-trial"
+ - TOXENV: "py35-trial"
+
 install:
  - echo Installed Pythons
  - dir c:\Python*