From 53d60cac4f8d53181843bc55847b8a4dd427a239 Mon Sep 17 00:00:00 2001
From: Kenneth Reitz <me@kennethreitz.com>
Date: Wed, 2 May 2012 02:38:20 -0400
Subject: [PATCH] Revert "Update Makefile and travis configuration to run all
 (non-external) tests"

This reverts commit a453a78c7c94aa220aa099dd62a36ec5b5232571.
---
 .travis.yml | 3 +--
 Makefile    | 9 ++++++---
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index b32441c7..5bac46eb 100644
--- 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 604976c3..25d02369 100644
--- 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