tests: move timeout from source to travis.yml

wavexx · Aug 21, 2014 · 10cf382 · 10cf382
1 parent eef06ec
commit 10cf382
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -21,4 +21,4 @@ install:
   - python setup.py -q install
 
 script:
-  - nosetests -v
+  - BOND_TIMEOUT=5 nosetests -v
diff --git a/tests/__init__.py b/tests/__init__.py
@@ -7,9 +7,8 @@
 
 # We keep the global timeout for testing way shorter than the default of 60.
 # This is done to limit execution time when tests are broken and also to spot
-# performance regressions. travis-ci though has truly unpredictable lag, so
-# we still make an exception.
-TIMEOUT = 5 if 'TRAVIS' in os.environ else 1
+# performance regressions.
+TIMEOUT = int(os.environ.get('BOND_TIMEOUT', 1))
 
 
 def knownfail(func):