From 0515f59c63f127a13c35db4a755aa675cefb10a1 Mon Sep 17 00:00:00 2001
From: Ronny Pfannschmidt <ronny.pfannschmidt@redhat.com>
Date: Wed, 9 Aug 2017 14:21:19 +0200
Subject: [PATCH 1/2] use sane travis config add newer pytest versions and
 remove tox-travis

---
 .travis.yml | 10 +++++++---
 tox.ini     |  6 ++++--
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index b56804c..fd9fba6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,13 +6,17 @@ python:
 - '3.4'
 - '3.5'
 - '3.6'
-install: pip install tox-travis setuptools_scm
+env:
+- TOXENV=py-pytest30
+- TOXENV=py-pytest31
+- TOXENV=py-pytest32
+install: pip install tox setuptools_scm
 matrix:
   include:
   # note: please use "tox --listenvs" to populate the build matrix
-  - python: "3.5"
+  - python: "3.6"
     env: TOXENV=flakes
-  - python: "3.5"
+  - python: "3.6"
     env: TOXENV=readme
 
 script: tox
diff --git a/tox.ini b/tox.ini
index 4bae876..b243f17 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,8 +1,8 @@
 [tox]
 # if you change the envlist, please update .travis.yml file as well
 envlist=
-  py{26,27,34,35,36}-pytest{30}
-  py{27,35}-pytest{30}-pexpect
+  py{26,27,34,35,36}-pytest{30,31,32}
+  py{27,36}-pytest{30,31,32}-pexpect
   flakes
   readme
 
@@ -15,6 +15,8 @@ deps =
   # to avoid .eggs
   setuptools_scm
   pytest30: pytest~=3.0.5
+  pytest31: pytest~=3.1.0
+  pytest32: pytest~=3.2.0
   pexpect: pexpect
 platform=
   pexpect: linux|darwin

From 15c51c497bad1e32b65fa32d464604b4a45c9dcc Mon Sep 17 00:00:00 2001
From: Ronny Pfannschmidt <ronny.pfannschmidt@redhat.com>
Date: Wed, 9 Aug 2017 14:31:42 +0200
Subject: [PATCH 2/2] mark looponfail tests broken by 3.1+ as xfail

---
 testing/test_looponfail.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/testing/test_looponfail.py b/testing/test_looponfail.py
index 6c714fd..e6d2bb9 100644
--- a/testing/test_looponfail.py
+++ b/testing/test_looponfail.py
@@ -193,6 +193,8 @@ class TestLooponFailing:
         assert 'test_one' not in remotecontrol.failures[0]
         assert 'test_two' in remotecontrol.failures[0]
 
+    @py.test.mark.xfail(py.test.__version__ >= "3.1",
+                        reason="broken by pytest 3.1+")
     def test_looponfail_removed_test(self, testdir):
         modcol = testdir.getmodulecol("""
             def test_one():