From 179dfe95102f7314ca6a59a95dd1080080a5724a Mon Sep 17 00:00:00 2001
From: Kali Kaneko <kali@leap.se>
Date: Tue, 12 Jul 2016 03:24:44 +0200
Subject: add pep8/flake8 to tox

---
 README.rst      | 7 +++----
 testing/tox.ini | 4 +++-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/README.rst b/README.rst
index 74a49d12..11455880 100644
--- a/README.rst
+++ b/README.rst
@@ -47,11 +47,10 @@ Compatibility
 Tests
 -----
 
-Client and server tests are both included in leap.soledad.common. If you want
-to run tests in development mode you must do the following::
+Soledad tests use tox, and they live in the testing folder::
 
-  scripts/develop_mode.sh
-  scripts/run_tests.sh
+  cd testing
+  tox
 
 Note that to run CouchDB tests, be sure you have `CouchDB`_ installed on your
 system.
diff --git a/testing/tox.ini b/testing/tox.ini
index 0a8dda9d..3663eef3 100644
--- a/testing/tox.ini
+++ b/testing/tox.ini
@@ -2,10 +2,12 @@
 envlist = py27
 
 [testenv]
-commands = py.test {posargs}
+commands = py.test --pep8 {posargs}
 changedir = tests
 deps =
     pytest
+    pytest-flake8
+    pytest-pep8
     mock
     testscenarios
     setuptools-trial
-- 
cgit v1.2.3