diff options
| author | Friedemann Kleint <[email protected]> | 2020-02-19 09:51:25 +0100 |
|---|---|---|
| committer | Friedemann Kleint <[email protected]> | 2020-02-20 22:16:57 +0100 |
| commit | f69d163d17d3717c28f2c065173113756d7c50ef (patch) | |
| tree | f8203180c87c919b228fed4f70d2a3a23b81246d /sources/pyside2/tests/QtWebKit | |
| parent | bc4d618d5f4c82c9a826a195043739c7e63ed138 (diff) | |
Pyside2/tests: Split the helper module
The classes of the helper module were defined in the __init__.py
file with complicated logic to test for presence of the modules.
Split the classes apart and empty the __init__.py file (still
required for Python2).
Change-Id: I4f4971f9a48e2961233da5585aa0df53bfbb9c7a
Reviewed-by: Christian Tismer <[email protected]>
Diffstat (limited to 'sources/pyside2/tests/QtWebKit')
8 files changed, 11 insertions, 9 deletions
diff --git a/sources/pyside2/tests/QtWebKit/bug_899.py b/sources/pyside2/tests/QtWebKit/bug_899.py index ad6fc68ba..681210444 100644 --- a/sources/pyside2/tests/QtWebKit/bug_899.py +++ b/sources/pyside2/tests/QtWebKit/bug_899.py @@ -34,7 +34,7 @@ sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__f from PySide2.QtCore import Property, QObject from PySide2.QtWebKit import QWebView -from helper import TimedQApplication +from helper.timedqapplication import TimedQApplication class TestLambdaPropery(TimedQApplication): diff --git a/sources/pyside2/tests/QtWebKit/bug_959.py b/sources/pyside2/tests/QtWebKit/bug_959.py index 6750acff2..6ddf25540 100644 --- a/sources/pyside2/tests/QtWebKit/bug_959.py +++ b/sources/pyside2/tests/QtWebKit/bug_959.py @@ -37,7 +37,7 @@ import unittest sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "util")) -from helper import UsesQApplication +from helper.usesqapplication import UsesQApplication functionID = -1 currentWebView = None diff --git a/sources/pyside2/tests/QtWebKit/qml_plugin_test.py b/sources/pyside2/tests/QtWebKit/qml_plugin_test.py index 6002884f2..5cb6cee57 100644 --- a/sources/pyside2/tests/QtWebKit/qml_plugin_test.py +++ b/sources/pyside2/tests/QtWebKit/qml_plugin_test.py @@ -36,7 +36,7 @@ from PySide2.QtCore import QUrl, QTimer from PySide2.QtWidgets import QApplication, QLabel from PySide2.QtWebKit import QWebPluginFactory, QWebView, QWebSettings -from helper import UsesQApplication +from helper.usesqapplication import UsesQApplication class PluginFactory(QWebPluginFactory): diff --git a/sources/pyside2/tests/QtWebKit/qvariantlist_property_test.py b/sources/pyside2/tests/QtWebKit/qvariantlist_property_test.py index d6bd52a3c..aeee109d0 100644 --- a/sources/pyside2/tests/QtWebKit/qvariantlist_property_test.py +++ b/sources/pyside2/tests/QtWebKit/qvariantlist_property_test.py @@ -34,7 +34,7 @@ sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__f from PySide2.QtCore import Property, QObject from PySide2.QtWebKit import QWebView -from helper import TimedQApplication +from helper.timedqapplication import TimedQApplication class TestLoadFinished(TimedQApplication): diff --git a/sources/pyside2/tests/QtWebKit/shouldInterruptjavascript_test.py b/sources/pyside2/tests/QtWebKit/shouldInterruptjavascript_test.py index b8f21d48f..722fc63d1 100644 --- a/sources/pyside2/tests/QtWebKit/shouldInterruptjavascript_test.py +++ b/sources/pyside2/tests/QtWebKit/shouldInterruptjavascript_test.py @@ -37,7 +37,7 @@ sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__f from PySide2 import QtCore, QtWebKit -from helper import UsesQApplication +from helper.usesqapplication import UsesQApplication class QWebPageHeadless(QtWebKit.QWebPage): # FIXME: This is not working, the slot is not overriden! diff --git a/sources/pyside2/tests/QtWebKit/webframe_test.py b/sources/pyside2/tests/QtWebKit/webframe_test.py index 455d0a8e7..b92174c80 100644 --- a/sources/pyside2/tests/QtWebKit/webframe_test.py +++ b/sources/pyside2/tests/QtWebKit/webframe_test.py @@ -36,8 +36,8 @@ from PySide2.QtCore import QObject, SIGNAL, QUrl from PySide2.QtWebKit import * from PySide2.QtNetwork import QNetworkRequest -from helper import adjust_filename, UsesQApplication - +from helper.helper import adjust_filename +from helper.usesqapplication import UsesQApplication class TestWebFrame(UsesQApplication): diff --git a/sources/pyside2/tests/QtWebKit/webpage_test.py b/sources/pyside2/tests/QtWebKit/webpage_test.py index 3ed6fa89d..22ad1ff9f 100644 --- a/sources/pyside2/tests/QtWebKit/webpage_test.py +++ b/sources/pyside2/tests/QtWebKit/webpage_test.py @@ -38,7 +38,8 @@ from PySide2.QtCore import QObject, SIGNAL, QUrl from PySide2.QtWebKit import QWebPage from PySide2.QtNetwork import QNetworkAccessManager -from helper import adjust_filename, TimedQApplication +from helper.helper import adjust_filename +from helper.timedqapplication import TimedQApplication #Define a global timeout because TimedQApplication uses a singleton! #Use a value big enough to run all the tests. diff --git a/sources/pyside2/tests/QtWebKit/webview_test.py b/sources/pyside2/tests/QtWebKit/webview_test.py index 50f20c40d..06e5b7d0f 100644 --- a/sources/pyside2/tests/QtWebKit/webview_test.py +++ b/sources/pyside2/tests/QtWebKit/webview_test.py @@ -40,7 +40,8 @@ from PySide2.QtCore import QObject, SIGNAL, QUrl from PySide2.QtWebKit import QWebPage, QWebView from PySide2.QtNetwork import QNetworkRequest -from helper import adjust_filename, TimedQApplication +from helper.helper import adjust_filename +from helper.timedqapplication import TimedQApplication class testWebPage(QWebPage): |