cleanup tests from merge of psf#2991

stephanelsmith · Feb 3, 2016 · 458cb64 · 458cb64
1 parent 5481db2
commit 458cb64
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 17 deletions.
diff --git a/.coveragerc b/.coveragerc
diff --git a/.gitignore b/.gitignore
@@ -5,6 +5,7 @@ nosetests.xml
 junit-report.xml
 pylint.txt
 toy.py
+tox.ini
 violations.pyflakes.txt
 cover/
 build/

diff --git a/Makefile b/Makefile
@@ -6,10 +6,10 @@ init:
 test:
 	# This runs all of the tests. To run an individual test, run py.test with
 	# the -k flag, like "py.test -k test_path_is_not_double_encoded"
-	python setup.py test -a "test_requests.py"
+	py.test test_requests.py
 
 coverage:
-	python setup.py test -a "--verbose --cov-report term --cov=requests test_requests.py"
+	py.test --verbose --cov-report term --cov=requests test_requests.py
 
 ci: init
 	py.test --junitxml=junit.xml

diff --git a/tox.ini b/tox.ini
-Original file line number
+Diff line change
@@ Expand Up / @@ -5,6 +5,7 @@ nosetests.xml @@
     junit-report.xml
     pylint.txt
     toy.py
+    tox.ini
     violations.pyflakes.txt
     cover/
     build/
@@ Expand Down @@