summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKali Kaneko <kali@leap.se>2016-07-12 03:24:44 +0200
committerKali Kaneko <kali@leap.se>2016-07-12 03:24:44 +0200
commit179dfe95102f7314ca6a59a95dd1080080a5724a (patch)
treeb0cea946a353076af70c0f57a162ed0d51d8f26d
parent9b0f6c70fd5b7adc507ea4a1d4cc80f4c05aa994 (diff)
add pep8/flake8 to tox
-rw-r--r--README.rst7
-rw-r--r--testing/tox.ini4
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