Merge pull request #380 from jschueller/qt6t

PR: Enable more qt6 tests
spyder-ide · Oct 25, 2022 · 1030f98 · 1030f98
2 parents f5581bd + 218a2e8
commit 1030f98
Show file tree

Hide file tree

Showing 9 changed files with 9 additions and 18 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -79,7 +79,7 @@ jobs:
         shell: bash
         run: |
           sudo apt update
-          sudo apt install libpulse-dev libegl1-mesa libopengl0
+          sudo apt install libpulse-dev libegl1-mesa libopengl0 gstreamer1.0-gl
       - name: Install Conda
         uses: conda-incubator/setup-miniconda@v2
         with:

diff --git a/qtpy/tests/test_qt3danimation.py b/qtpy/tests/test_qt3danimation.py
@@ -2,7 +2,6 @@
 from qtpy import PYQT5, PYSIDE2
 
 
-@pytest.mark.skipif(not (PYQT5 or PYSIDE2), reason="Only available in Qt5 bindings")
 def test_qt3danimation():
     """Test the qtpy.Qt3DAnimation namespace"""
     Qt3DAnimation = pytest.importorskip("qtpy.Qt3DAnimation")

diff --git a/qtpy/tests/test_qtmultimediawidgets.py b/qtpy/tests/test_qtmultimediawidgets.py
@@ -6,15 +6,12 @@
 from qtpy.tests.utils import using_conda
 
 
-@pytest.mark.skipif(not (PYQT5 or PYSIDE2), reason="Only available in Qt5 bindings")
-@pytest.mark.skipif(
-    using_conda(), reason="Conda packages don't seem to include QtMultimedia"
-)
 def test_qtmultimediawidgets():
     """Test the qtpy.QtMultimediaWidgets namespace"""
     from qtpy import QtMultimediaWidgets
 
-    assert QtMultimediaWidgets.QCameraViewfinder is not None
+    if PYQT5 or PYSIDE2:
+        assert QtMultimediaWidgets.QCameraViewfinder is not None
+        # assert QtMultimediaWidgets.QVideoWidgetControl is not None
     assert QtMultimediaWidgets.QGraphicsVideoItem is not None
     assert QtMultimediaWidgets.QVideoWidget is not None
-    # assert QtMultimediaWidgets.QVideoWidgetControl is not None
diff --git a/qtpy/tests/test_qtpositioning.py b/qtpy/tests/test_qtpositioning.py
@@ -2,7 +2,6 @@
 from qtpy import PYQT5, PYSIDE2
 
 
-@pytest.mark.skipif(not (PYQT5 or PYSIDE2), reason="Only available in Qt5 bindings")
 def test_qtpositioning():
     """Test the qtpy.QtPositioning namespace"""
     from qtpy import QtPositioning

diff --git a/qtpy/tests/test_qtqml.py b/qtpy/tests/test_qtqml.py
@@ -1,8 +1,7 @@
 import pytest
-from qtpy import PYQT5, PYSIDE2
+from qtpy import PYQT5, PYSIDE2, PYSIDE6
 
 
-@pytest.mark.skipif(not (PYQT5 or PYSIDE2), reason="Only available in Qt5 bindings")
 def test_qtqml():
     """Test the qtpy.QtQml namespace"""
     from qtpy import QtQml
@@ -22,7 +21,7 @@ def test_qtqml():
     assert QtQml.QQmlFileSelector is not None
     assert QtQml.QQmlIncubationController is not None
     assert QtQml.QQmlIncubator is not None
-    if not PYSIDE2:
+    if not (PYSIDE2 or PYSIDE6):
         # https://wiki.qt.io/Qt_for_Python_Missing_Bindings#QtQml
         assert QtQml.QQmlListProperty is not None
     assert QtQml.QQmlListReference is not None

diff --git a/qtpy/tests/test_qtquick.py b/qtpy/tests/test_qtquick.py
@@ -2,7 +2,6 @@
 from qtpy import PYQT5, PYSIDE2
 
 
-@pytest.mark.skipif(not (PYQT5 or PYSIDE2), reason="Only available in Qt5 bindings")
 def test_qtquick():
     """Test the qtpy.QtQuick namespace"""
     from qtpy import QtQuick
@@ -32,11 +31,12 @@ def test_qtquick():
     assert QtQuick.QQuickTextureFactory is not None
     assert QtQuick.QQuickView is not None
     assert QtQuick.QQuickWindow is not None
-    assert QtQuick.QSGAbstractRenderer is not None
+    if PYQT5 or PYSIDE2:
+        assert QtQuick.QSGAbstractRenderer is not None
+        assert QtQuick.QSGEngine is not None
     assert QtQuick.QSGBasicGeometryNode is not None
     assert QtQuick.QSGClipNode is not None
     assert QtQuick.QSGDynamicTexture is not None
-    assert QtQuick.QSGEngine is not None
     assert QtQuick.QSGGeometry is not None
     assert QtQuick.QSGGeometryNode is not None
     assert QtQuick.QSGMaterialType is not None

diff --git a/qtpy/tests/test_qtquickwidgets.py b/qtpy/tests/test_qtquickwidgets.py
@@ -2,7 +2,6 @@
 from qtpy import PYQT5, PYSIDE2
 
 
-@pytest.mark.skipif(not (PYQT5 or PYSIDE2), reason="Only available in Qt5 bindings")
 def test_qtquickwidgets():
     """Test the qtpy.QtQuickWidgets namespace"""
     from qtpy import QtQuickWidgets

diff --git a/qtpy/tests/test_qtwebchannel.py b/qtpy/tests/test_qtwebchannel.py
@@ -2,7 +2,6 @@
 from qtpy import PYQT5, PYSIDE2
 
 
-@pytest.mark.skipif(not (PYQT5 or PYSIDE2), reason="Only available in Qt5 bindings")
 def test_qtwebchannel():
     """Test the qtpy.QtWebChannel namespace"""
     from qtpy import QtWebChannel

diff --git a/qtpy/tests/test_qtwebsockets.py b/qtpy/tests/test_qtwebsockets.py
@@ -2,7 +2,6 @@
 from qtpy import PYQT5, PYSIDE2
 
 
-@pytest.mark.skipif(not (PYQT5 or PYSIDE2), reason="Only available in Qt5 bindings")
 def test_qtwebsockets():
     """Test the qtpy.QtWebSockets namespace"""
     from qtpy import QtWebSockets