Added -j shortcut for --processes=

bcongdon · bcongdon · commit ca8dcee8291b · 2016-11-08T10:09:47.000-06:00
diff --git a/.travis.yml b/.travis.yml
@@ -44,7 +44,7 @@ env:
     - PANDAS=
     - NPROC=2
     - TEST_ARGS=--no-pep8
-    - NOSE_ARGS="--processes=$NPROC --process-timeout=300"
+    - NOSE_ARGS="-j $NPROC"
     - PYTEST_ARGS="-ra --timeout=300 --durations=25 --cov-report= --cov=lib" # -n $NPROC
     - PYTHON_ARGS=
     - DELETE_FONT_CACHE=
diff --git a/tests.py b/tests.py
@@ -28,6 +28,14 @@
         disable_internet.turn_off_internet()
         extra_args.extend(['-a', '!network'])
         sys.argv.remove('--no-network')
+    if '-j' in sys.argv:
+        nproc = sys.argv[sys.argv.index('-j') + 1]
+        extra_args.extend([
+            '--processes={}'.format(int(nproc)),
+            '--process-timeout=300'
+        ])
+        sys.argv.remove('-j')
+        sys.argv.remove(nproc)
 
     print('Python byte-compilation optimization level: %d' % sys.flags.optimize)
 
