2 Commits

Author	SHA1	Message	Date
Xavier Ordoquy	7b4463f739	Merge remote-tracking branch 'reference/2.4.0' into feature/pytest ... Conflicts: rest_framework/runtests/urls.py tests/test_response.py tox.ini	2014-05-01 08:01:38 +02:00
Andreas Pelme	971578ca34	Support for running the test suite with py.test ... * Get rid of runtests.py * Moved test code from rest_framework/tests and rest_framework/runtests to tests * Invoke py.test from setup.py * Invoke py.test from Travis * Invoke py.test from tox * Changed setUpClass to be just plain setUp in test_permissions.py * Updated contribution guideline to show how to invoke py.test	2014-03-02 12:40:30 +01:00