Testing: Move Python 2.7/PyQt5 tests to Travis too

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

Hide file tree

Showing 2 changed files with 10 additions and 4 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/spyder/plugins/tests/test_ipythonconsole.py b/spyder/plugins/tests/test_ipythonconsole.py
@@ -53,6 +53,11 @@ def close_widget():
     return widget
 
 
+# Skip in Python 2 because it times out on Travis and CircleCI
+if PY2:
+    pytest.skip()
+
+
 #==============================================================================
 # Tests
 #==============================================================================