From fa1c97fc2a7f25fe178b0c180b56f78ac00bc4c9 Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Fri, 3 Nov 2017 14:08:27 +0100 Subject: Remove sys.path manipulations from test The sys.path hack is no longer necessary because we pass a proper PYTHONPATH from the CMakeLists file to the test wrapper. Change-Id: Ie9ad8802e64cf7c9ffec16ae55777d5d23654662 Reviewed-by: Friedemann Kleint --- .../pyside2/tests/QtWidgets/qstandarditemmodel_test.py | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/sources/pyside2/tests/QtWidgets/qstandarditemmodel_test.py b/sources/pyside2/tests/QtWidgets/qstandarditemmodel_test.py index 2e9d260a3..6ab60e730 100644 --- a/sources/pyside2/tests/QtWidgets/qstandarditemmodel_test.py +++ b/sources/pyside2/tests/QtWidgets/qstandarditemmodel_test.py @@ -32,18 +32,14 @@ import sys from PySide2.QtGui import QStandardItemModel, QStandardItem from PySide2.QtWidgets import QWidget try: - # the normal call with installed PySide2 + # The normal import statement when PySide2 is installed. from PySide2 import shiboken2 as shiboken except ImportError: - try: - # When running make test on macOS, shiboken2 is not part of the PySide2 module, - # so it needs to be imported as a standalone module. - import shiboken2 as shiboken - except ImportError: - # sys.path is set a bit weird during tests, so we help a little to find shiboken2. - sys.path.append("../../..") - # the special call with testrunner.py - from shiboken2.shibokenmodule import shiboken2 as shiboken + # When running make test in shiboken build dir, or when running testrunner.py, + # shiboken2 is not part of the PySide2 module, so it needs to be imported as a standalone + # module. + import shiboken2 as shiboken + from helper import UsesQApplication -- cgit v1.2.3