From: Shivaram Lingamneni <slingamn@cs.stanford.edu>
Date: Wed, 2 May 2012 06:42:24 +0000 (-0700)
Subject: Have Travis run all tests except the external and async ones
X-Git-Tag: v0.12.1~12^2~3
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=57ccd7e65c30ffef773c7e60a582ce9325482fed;p=services%2Fpython-requests.git

Have Travis run all tests except the external and async ones

(async is currently unsupported under Python 3)
---

diff --git a/.travis.yml b/.travis.yml
index 5bac46e..1052198 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,7 +4,7 @@ python:
   - 2.7
   - 3.2
 env: HTTPBIN_URL=http://httpbin.org/
-script: make simpleci
+script: make ci
 install:
   - pip install nose
   - pip install . --use-mirrors
diff --git a/Makefile b/Makefile
index 25d0236..db38771 100644
--- a/Makefile
+++ b/Makefile
@@ -13,15 +13,12 @@ lazy:
 simple:
 	nosetests tests/test_requests.py
 
+ci:
+	find tests/ -name "*.py" ! -name "test_requests_ext.py" ! -name "test_requests_async.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