Add test environments using pytest master and features branches

.travis.yml

@@ -29,6 +29,14 @@ jobs:
   include:
     - stage: test
     # python x env above are already included into this stage
+    - python: "2.7"
+      env: TOXENV=py27-pytestmaster
+    - python: "2.7"
+      env: TOXENV=py27-pytestfeatures
+    - python: "3.6"
+      env: TOXENV=py36-pytestmaster
+    - python: "3.6"
+      env: TOXENV=py36-pytestfeatures
     - python: "3.6"
       env: TOXENV=flakes
     - python: "3.6"

tox.ini

@@ -3,6 +3,7 @@
 envlist=
   py{26,27,34,35,36}-pytest{30,31,32}
   py{27,36}-pytest{30,31,32}-pexpect
+  py{27,36}-pytest{master,features}
   flakes
   readme
 
@@ -17,6 +18,8 @@ deps =
   pytest30: pytest~=3.0.5
   pytest31: pytest~=3.1.0
   pytest32: pytest~=3.2.0
+  pytestmaster: git+https://github.com/pytest-dev/pytest.git@master
+  pytestfeatures: git+https://github.com/pytest-dev/pytest.git@features
   pexpect: pexpect
 platform=
   pexpect: linux|darwin