Testing: Move Python 2.7/PyQt5 tests to Travis too

spyder-ide · May 22, 2017 · 87f700c · 87f700c
1 parent 4fed52c
commit 87f700c
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -6,10 +6,9 @@ sudo: false
 
 matrix:
   include:
-    # This never ends!
-    #- python: "2.7"
-    #  env: TEST_MODULES=false
-    #  os: linux
+    - python: "2.7"
+      env: TEST_MODULES=false USE_PYQT=pyqt5
+      os: linux
     - python: "2.7"
       env: TEST_MODULES=true USE_PYQT=pyqt4
       os: linux
@@ -19,6 +18,8 @@ matrix:
     - python: "3.5"
       env: TEST_MODULES=true USE_PYQT=pyqt4
       os: linux
+    # This slot test runs our tests only with pip
+    # packages
     - python: "3.5"
       env: TEST_MODULES=false USE_PYQT=pyqt5
       os: linux

diff --git a/continuous_integration/travis/test-qt5.sh b/continuous_integration/travis/test-qt5.sh
@@ -12,5 +12,8 @@ else
     conda install -q qt=5.* pyqt=5.* qtconsole matplotlib
 fi
 
-
-python runtests.py
+if [ "$TRAVIS_PYTHON_VERSION" = "2.7" ]; then
+    timeout --preserve-status --kill-after=15m 15m python runtests.py
+else
+    python runtests.py
+fi