From fda477397e2e6b9bfc916522f7a196c93213d7f9 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Mon, 5 Oct 2015 19:06:00 +0200
Subject: [PATCH] Get rid of py34-integration testenv.

Fixes #1000.
---
 .appveyor.yml |  1 -
 .travis.yml   |  2 +-
 tox.ini       | 24 +++++++-----------------
 3 files changed, 8 insertions(+), 19 deletions(-)

diff --git a/.appveyor.yml b/.appveyor.yml
index 2a01ba3dc..f0e766372 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -12,6 +12,5 @@ install:
 
 test_script:
   - C:\Python34\Scripts\tox -e py34
-  - C:\Python34\Scripts\tox -e py34-integration
   - C:\Python34\Scripts\tox -e unittests-frozen
   - C:\Python34\Scripts\tox -e pylint
diff --git a/.travis.yml b/.travis.yml
index f142e263b..f387d0e76 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -21,7 +21,7 @@ install:
   - python scripts/dev/ci_install.py
 
 script:
-    - xvfb-run -s "-screen 0 640x480x16" tox -e py34,py34-integration
+    - xvfb-run -s "-screen 0 640x480x16" tox -e py34
     - '[[ $TRAVIS_OS_NAME == linux ]] && tox -e unittests-nodisp || true'
     - '[[ $TRAVIS_OS_NAME == linux ]] && tox -e misc || true'
     - '[[ $TRAVIS_OS_NAME == linux ]] && tox -e pep257 || true'
diff --git a/tox.ini b/tox.ini
index 3d685f942..ddda3b36a 100644
--- a/tox.ini
+++ b/tox.ini
@@ -4,7 +4,7 @@
 # and then run "tox" from this directory.
 
 [tox]
-envlist = py34,py34-integration,misc,pep257,pyflakes,pep8,mccabe,pylint,pyroma,check-manifest
+envlist = py34,misc,pep257,pyflakes,pep8,mccabe,pylint,pyroma,check-manifest
 
 [testenv]
 # https://bitbucket.org/hpk42/tox/issue/246/ - only needed for Windows though
@@ -15,6 +15,7 @@ setenv =
 passenv = PYTHON DISPLAY XAUTHORITY HOME USERNAME USER CI
 deps =
     -r{toxinidir}/requirements.txt
+    wheel==0.26.0
     py==1.4.30
     pytest==2.7.3  # rq.filter: <2.8.0
     pytest-capturelog==0.7
@@ -25,24 +26,13 @@ deps =
     coverage==4.0.0
     pytest-cov==2.2.0
     beautifulsoup4==4.4.1
-
-commands =
-    {envpython} scripts/link_pyqt.py --tox {envdir}
-    {envpython} -m py.test --strict -rfEsw -m 'not integration' --cov qutebrowser --cov-report xml --cov-report=html --cov-report= {posargs:tests}
-    {envpython} scripts/dev/check_coverage.py {posargs}
-
-[testenv:py34-integration]
-basepython = python3
-setenv = {[testenv]setenv}
-passenv = {[testenv]passenv}
-deps =
-    {[testenv]deps}
     httpbin==0.3.0
     itsdangerous==0.24
     Werkzeug==0.10.4
 commands =
     {envpython} scripts/link_pyqt.py --tox {envdir}
-    {envpython} -m py.test --strict -rfEsw -m 'integration' {posargs:tests}
+    {envpython} -m py.test --strict -rfEsw --cov qutebrowser --cov-report xml --cov-report=html --cov-report= {posargs:tests}
+    {envpython} scripts/dev/check_coverage.py {posargs}
 
 [testenv:mkvenv]
 basepython = python3
@@ -55,7 +45,7 @@ basepython = python3
 passenv = {[testenv]passenv}
 skip_install = true
 deps =
-    {[testenv:py34-integration]deps}
+    {[testenv]deps}
     cx_Freeze==4.3.4
 commands =
     {envpython} scripts/link_pyqt.py --tox {envdir}
@@ -71,7 +61,7 @@ setenv =
     QUTE_NO_DISPLAY_OK=1
 commands =
     {envpython} scripts/link_pyqt.py --tox {envdir}
-    {envpython} -m py.test --strict -rfEw -m 'not integration' {posargs:tests}
+    {envpython} -m py.test --strict -rfEw {posargs:tests}
 
 [testenv:misc]
 basepython = python3
@@ -91,7 +81,7 @@ skip_install = true
 setenv = PYTHONPATH={toxinidir}/scripts/dev
 passenv =
 deps =
-    {[testenv:py34-integration]deps}
+    {[testenv]deps}
     {[testenv:misc]deps}
     astroid==1.3.8
     pylint==1.4.4