Fixed running tests on Travis CI

Author: saghul

.travis.yml

@@ -1,19 +1,19 @@
+sudo: false
 language: python
-python: 2.7
-env:
-    - TOX_ENV=py26
-    - TOX_ENV=py27
-    - TOX_ENV=py32
-    - TOX_ENV=py33
-    - TOX_ENV=pypy
+matrix:
+    include:
+        - python: 2.6
+          env: TOXENV=py26
+        - python: 2.7
+          env: TOXENV=py27
+        - python: 3.3
+          env: TOXENV=py33
+        - python: 3.4
+          env: TOXENV=py34
+        - python: pypy
+          env: TOXENV=pypy
 install:
-    - "[[ ${TOX_ENV} == pypy ]] && sudo add-apt-repository -y ppa:pypy/ppa || true"
-    - "[[ ${TOX_ENV} == pypy ]] && sudo apt-get -y update && sudo apt-get -y install pypy || true"
-    # This is required because we need to get rid of the Travis installed PyPy
-    # or it'll take precedence over the PPA installed one.
-    - "[[ ${TOX_ENV} == pypy ]] && sudo rm -rf /usr/local/pypy/bin || true"
-    - "[[ ${TOX_ENV} == pypy ]] && pypy --version || true"
     - pip install tox
 script:
-    - tox -e $TOX_ENV
+    - tox
 

tests/test_fibers.py

@@ -7,7 +7,7 @@
 import os
 import sys
 
-if 'TOX_ENV' not in os.environ:
+if 'IS_TOX' not in os.environ:
     sys.path.insert(0, '../')
 
 import fibers

tests/test_gc.py

@@ -6,7 +6,7 @@
 import os
 import sys
 
-if 'TOX_ENV' not in os.environ:
+if 'IS_TOX' not in os.environ:
     sys.path.insert(0, '../')
 
 from fibers import Fiber, current

tests/test_generator.py

@@ -4,7 +4,7 @@
 import os
 import sys
 
-if 'TOX_ENV' not in os.environ:
+if 'IS_TOX' not in os.environ:
     sys.path.insert(0, '../')
 
 import fibers

tests/test_generator_nested.py

@@ -4,7 +4,7 @@
 import os
 import sys
 
-if 'TOX_ENV' not in os.environ:
+if 'IS_TOX' not in os.environ:
     sys.path.insert(0, '../')
 
 import fibers

tests/test_leaks.py

@@ -7,7 +7,7 @@
 import os
 import sys
 
-if 'TOX_ENV' not in os.environ:
+if 'IS_TOX' not in os.environ:
     sys.path.insert(0, '../')
 
 from fibers import Fiber, current

tests/test_throw.py

@@ -4,7 +4,7 @@
 import os
 import sys
 
-if 'TOX_ENV' not in os.environ:
+if 'IS_TOX' not in os.environ:
     sys.path.insert(0, '../')
 
 import fibers

tests/test_weakref.py

@@ -6,7 +6,7 @@
 import os
 import sys
 
-if 'TOX_ENV' not in os.environ:
+if 'IS_TOX' not in os.environ:
     sys.path.insert(0, '../')
 
 import fibers

tox.ini

@@ -1,7 +1,8 @@
 [tox]
-envlist  = py26, py27, py31, py32, py33, pypy
+envlist  = py26, py27, py33, py34, pypy
 
 [testenv]
+setenv   = IS_TOX=1
 deps     = nose
 commands = nosetests -v []