Revert "Update Makefile and travis configuration to run all (non-exte…

…rnal) tests" This reverts commit a453a78.
psf · May 2, 2012 · 53d60ca · 53d60ca
1 parent 6271046
commit 53d60ca
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -4,8 +4,7 @@ python:
   - 2.7
   - 3.2
 env: HTTPBIN_URL=http://httpbin.org/
-script: make ci
+script: make simpleci
 install:
   - pip install nose
-  - pip install gevent
   - pip install . --use-mirrors
diff --git a/Makefile b/Makefile
@@ -13,12 +13,15 @@ lazy:
 simple:
 	nosetests tests/test_requests.py
 
-ci:
-	find tests/ -name "*.py" ! -path "test_requests_ext.py" | xargs nosetests --with-xunit --xunit-file=junit-report.xml
-
 server:
 	gunicorn httpbin:app --bind=0.0.0.0:7077 &
 
+ci: init
+	nosetests tests/test_requests.py --with-xunit --xunit-file=junit-report.xml
+
+simpleci:
+	nosetests tests/test_requests.py --with-xunit --xunit-file=junit-report.xml
+
 stats:
 	pyflakes requests | awk -F\: '{printf "%s:%s: [E]%s\n", $1, $2, $3}' > violations.pyflakes.txt