Revert "Update Makefile and travis configuration to run all (non-external) tests"

This reverts commit a453a78c7c94aa220aa099dd62a36ec5b5232571.

diff --git a/.travis.yml b/.travis.yml
index b32441c7cd54890346a8d2af7d968d7677a2c6b1..5bac46eb0a0d1df10f72504b5f4331818469bfa5 100644 (file)
--- 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
index 604976c33801d29feb549afe63cd3b762a038197..25d023695de76b3f46e7153c09eec0db1dac1c49 100644 (file)
--- 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