aboutsummaryrefslogtreecommitdiffstats
path: root/docs
diff options
context:
space:
mode:
authorMaximilian Hils <git@maximilianhils.com>2015-09-21 18:31:30 +0200
committerMaximilian Hils <git@maximilianhils.com>2015-09-21 18:31:30 +0200
commitbba5ec7144f0e08d4b26bad2987c6e7f0871b83d (patch)
treee462047f6169bd64b6bab99b8d8259bb0697bcf9 /docs
parent88375ad64aa2f53b9447df1ccd7aa7ee77cb04ef (diff)
downloadmitmproxy-bba5ec7144f0e08d4b26bad2987c6e7f0871b83d.tar.gz
mitmproxy-bba5ec7144f0e08d4b26bad2987c6e7f0871b83d.tar.bz2
mitmproxy-bba5ec7144f0e08d4b26bad2987c6e7f0871b83d.zip
experimental: run tests using py.tests
Diffstat (limited to 'docs')
-rw-r--r--docs/dev/testing.rst5
-rw-r--r--docs/transparent/osx.rst2
2 files changed, 4 insertions, 3 deletions
diff --git a/docs/dev/testing.rst b/docs/dev/testing.rst
index 36c85426..d7554954 100644
--- a/docs/dev/testing.rst
+++ b/docs/dev/testing.rst
@@ -7,10 +7,10 @@ All the mitmproxy projects strive to maintain 100% code coverage. In general,
patches and pull requests will be declined unless they're accompanied by a
suitable extension to the test suite.
-Our tests are written for the nose_ test framework.
+Our tests are written for the `py.test`_ or nose_ test frameworks.
At the point where you send your pull request, a command like this:
->>> nosetests --with-cov --cov-report term-missing ./test
+>>> py.test -n 4 --cov libmproxy
Should give output something like this:
@@ -44,3 +44,4 @@ excluded from coverage analysis either in the **.coveragerc** file, or using
these measures as sparingly as possible.
.. _nose: https://nose.readthedocs.org/en/latest/
+.. _py.test: https://pytest.org/
diff --git a/docs/transparent/osx.rst b/docs/transparent/osx.rst
index 5a4a3173..1791105f 100644
--- a/docs/transparent/osx.rst
+++ b/docs/transparent/osx.rst
@@ -30,7 +30,7 @@ Note that this means we don't support transparent mode for earlier versions of O
5. And now enable it:
- >>>sudo pfctl -e
+ >>> sudo pfctl -e
6. Configure sudoers to allow mitmproxy to access pfctl. Edit the file
**/etc/sudoers** on your system as root. Add the following line to the end