From 11455d0bcd8593d3f32484ee14d757654b2396d1 Mon Sep 17 00:00:00 2001
From: Brian May <brian@linuxpenguins.xyz>
Date: Fri, 16 Mar 2018 18:27:50 +1100
Subject: Various updates to tests

---
 .travis.yml            | 7 ++++---
 requirements-tests.txt | 1 +
 tox.ini                | 8 +++++---
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 6fbfaa2..b716831 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,16 +4,17 @@ python:
 - 2.7
 - 3.4
 - 3.5
+- 3.6
 - pypy
 
 install:
-    - travis_retry pip install -q flake8 pytest mock
+    - travis_retry pip install -q -r requirements-tests.txt
 
 before_script:
     # stop the build if there are Python syntax errors or undefined names.
-    - if [[ $TRAVIS_PYTHON_VERSION != '2.6' ]]; then flake8 . --count --select=E901,E999,F821,F822,F823 --show-source --statistics; fi
+    - if [[ $TRAVIS_PYTHON_VERSION != '2.6' ]]; then flake8 sshuttle --count --select=E901,E999,F821,F822,F823 --show-source --statistics; fi
     # exit-zero treats all errors as warnings.  The GitHub editor is 127 chars wide.
-    - if [[ $TRAVIS_PYTHON_VERSION != '2.6' ]]; then flake8 . --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics; fi
+    - if [[ $TRAVIS_PYTHON_VERSION != '2.6' ]]; then flake8 sshuttle --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics; fi
 
 script:
   - PYTHONPATH=. py.test
diff --git a/requirements-tests.txt b/requirements-tests.txt
index 2c81dfc..9e8fee0 100644
--- a/requirements-tests.txt
+++ b/requirements-tests.txt
@@ -1,3 +1,4 @@
 -r requirements.txt
 pytest==3.4.2
 mock==2.0.0
+flake8==3.5.0
diff --git a/tox.ini b/tox.ini
index 2b66655..1fc6079 100644
--- a/tox.ini
+++ b/tox.ini
@@ -5,6 +5,7 @@ envlist =
     py27,
     py34,
     py35,
+    py36,
 
 [testenv]
 basepython =
@@ -12,9 +13,10 @@ basepython =
     py27: python2.7
     py34: python3.4
     py35: python3.5
+    py36: python3.6
 commands =
+    flake8 sshuttle --count --select=E901,E999,F821,F822,F823 --show-source --statistics
+    flake8 sshuttle --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics
     py.test
 deps =
-    pytest
-    mock
-    setuptools>=17.1
+    -rrequirements-tests.txt
-- 
cgit v1.2.3