From e70179a6201ba2149d61356badd908900680821d Mon Sep 17 00:00:00 2001 From: Kevin Burke Date: Sat, 23 Aug 2014 10:02:27 -0700 Subject: [PATCH 1/2] Clarify which tests to run in the Makefile If you put your Virtualenv in the same folder as Requests (as I usually do), py.test will pick up any test_* files inside the virtualenv and attempt to run them too, leading to the following error: https://gist.github.com/kevinburke/1aa2b07e01de3a7daa15 Instead specify the test file we would like to run in the Makefile. --- Makefile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 3c838c93..7c858729 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,9 @@ init: pip install -r requirements.txt test: - py.test + # This runs all of the tests. To run an individual test, run py.test with + # the -k flag, like "py.test -k " + py.test test_requests.py coverage: py.test --verbose --cov-report term --cov=requests test_requests.py From 024db279c48edfaafe4b6b97921b292c6687a4e3 Mon Sep 17 00:00:00 2001 From: Kevin Burke Date: Sat, 23 Aug 2014 10:10:44 -0700 Subject: [PATCH 2/2] clarify comment --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 7c858729..687f21a3 100644 --- a/Makefile +++ b/Makefile @@ -5,7 +5,7 @@ init: test: # This runs all of the tests. To run an individual test, run py.test with - # the -k flag, like "py.test -k " + # the -k flag, like "py.test -k test_path_is_not_double_encoded" py.test test_requests.py coverage: