Skip to content

Commit

Permalink
Merge pull request #632 from florentcpt/631-use-pytest
Browse files Browse the repository at this point in the history
Use pytest as test framework
  • Loading branch information
JonathanHuot committed Dec 20, 2018
2 parents e9c6f01 + 31461a0 commit 5d76d02
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions docs/contributing.rst
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ the project root via:

.. sourcecode:: bash

$ python -m unittest discover
$ py.test

The first thing the core committers will do is run this command. Any pull
request that fails this test suite will be **rejected**.
Expand Down Expand Up @@ -301,7 +301,7 @@ First we pull the code into a local branch::

Then we run the tests::

python -m unittest discover
py.test

We finish with a non-fastforward merge (to preserve the branch history) and push
to GitHub::
Expand Down
3 changes: 2 additions & 1 deletion requirements-test.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
-r requirements.txt
coverage>=3.7.1
mock>=2.0
pytest>=4.0
pytest-cov>=2.6
3 changes: 1 addition & 2 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,7 @@ envlist = py27,py34,py35,py36,py37,pypy,pypy3,docs,readme,bandit
deps=
-rrequirements-test.txt
commands=
coverage run --source oauthlib -m unittest discover
coverage report
py.test --cov=oauthlib tests/


# tox -e docs to mimick readthedocs build.
Expand Down

0 comments on commit 5d76d02

Please sign in to comment.