Modified tests on Travis CI

sharppy · Sep 12, 2019 · 065d33e · 065d33e
1 parent d34ea02
commit 065d33e
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -11,15 +11,15 @@ matrix:
   - os: linux
     language: generic
     env: 
-      - PYTHON_VERSION="3.6" BUILD_CONDA="YES" NUMPY_VERSION=1.15
+      - PYTHON_VERSION="3.6" BUILD_CONDA="YES" NUMPY_VERSION=1.15 DISPLAY_AVAIL="NO"
   - os: osx
     language: generic
     env: 
       - PYTHON_VERSION="3.6" DISPLAY_AVAIL="NO" BUILD_BINARY="YES" NUMPY_VERSION=1.15
   - os: linux
     language: generic
     env:
-      - PYTHON_VERSION="3.6" BUILD_DOCS="YES" NUMPY_VERSION=1.15 COVERALLS="YES"
+      - PYTHON_VERSION="3.6" BUILD_DOCS="YES" NUMPY_VERSION=1.15 COVERALLS="YES" DISPLAY_AVAIL="NO"
 before_install:
 - source ci/install.sh
 install:

diff --git a/sharppy/tests/test_binary.py b/sharppy/tests/test_binary.py
@@ -4,10 +4,9 @@
 import glob
 import sharppy.databases.sars as sars
 import numpy as np
-#from PySide import QtGui
 full_gui = pytest.importorskip('runsharp.full_gui') 
 
-#@pytest.mark.skipif(QtGui.QX11Info.display())
+#@pytest.mark.skipif(QtGui.QX11Info.display#())
 @pytest.mark.skipif("DISPLAY_AVAIL" in os.environ and os.environ["DISPLAY_AVAIL"] == 'NO', reason="DISPLAY not set")
 def test_main_entry_pt():
     #sys.argv = []

diff --git a/sharppy/tests/test_gui.py b/sharppy/tests/test_gui.py
@@ -23,6 +23,7 @@
     app = QtWidgets.QApplication.instance()
 
 #@pytest.mark.skipif(True, reason="DISPLAY not set")
+#@pytest.mark.skipif(True)
 @pytest.mark.skipif("DISPLAY_AVAIL" in os.environ and os.environ["DISPLAY_AVAIL"] == 'NO', reason="DISPLAY not set")
 def test_insets():
     insets = [viz.fire.plotFire,