From 923174718efe4f16256b1978ef64b6f4dbd2fce0 Mon Sep 17 00:00:00 2001
From: Bruno Oliveira <nicoddemus@gmail.com>
Date: Wed, 17 Jun 2015 00:44:31 -0300
Subject: [PATCH] Allow failure of py27-subprocess tox-env while on pytest-2.7

"inprocess by default" was introduced in 2.8, and the current travis
configuration was backported from master so this specific
tox-env will remain disabled while pytest-2.7 maintenance branch
lasts.
---
 .travis.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 175bd0222..a6fc5757d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -20,7 +20,9 @@ env:
     - TESTENV=py27-trial
     - TESTENV=py33
     - TESTENV=py33-trial
-    - TESTENV=py27-subprocess
+    # inprocess tests by default were introduced in 2.8 only;
+    # this TESTENV should be enabled when merged back to master
+    #- TESTENV=py27-subprocess
     - TESTENV=doctesting
     - TESTENV=py27-cxfreeze
     - TESTENV=coveralls