From f183922c613d0150d151aefe8670dfdf765a61fe Mon Sep 17 00:00:00 2001
From: wiredfool <eric-github@soroos.net>
Date: Wed, 25 Jun 2014 15:01:47 -0700
Subject: [PATCH] Make nose run tests in parallel

---
 .travis.yml       | 2 +-
 test-installed.py | 8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 4de1fde99..c4964e166 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,7 +3,7 @@ language: python
 notifications:
   irc: "chat.freenode.net#pil"
 
-env: MAX_CONCURRENCY=4
+env: MAX_CONCURRENCY=4 NOSE_PROCESSES=4 NOSE_PROCESS_TIMEOUT=30
 
 python:
   - "pypy"
diff --git a/test-installed.py b/test-installed.py
index 7f58f4966..8e4ab84a2 100755
--- a/test-installed.py
+++ b/test-installed.py
@@ -20,5 +20,13 @@ if len(sys.argv) == 1:
 if ('--no-path-adjustment' not in sys.argv) and ('-P' not in sys.argv):
     sys.argv.insert(1, '--no-path-adjustment')
 
+if 'NOSE_PROCESSES' not in os.environ:
+    for arg in sys.argv:
+        if '--processes' in arg:
+            break
+    else: #  for
+        sys.argv.insert(1, '--processes=-1') # -1 == number of cores
+        sys.argv.insert(1, '--process-timeout=30') 
+    
 if __name__ == '__main__':
     nose.main()