11 files changed, 79 insertions, 12 deletions
diff --git a/sources/pyside2/tests/QtWebKit/bug_448.py b/sources/pyside2/tests/QtWebKit/bug_448.py
index c8341840a..98ebb1958 100644
--- a/sources/pyside2/tests/QtWebKit/bug_448.py
+++ b/sources/pyside2/tests/QtWebKit/bug_448.py
@@ -28,8 +28,13 @@
 
 '''Test cases for bug: http://bugs.openbossa.org/show_bug.cgi?id=448'''
 
-import unittest
+import os
 import sys
+import unittest
+
+sys.path.append(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
+from init_paths import init_test_paths
+init_test_paths(False)
 
 from PySide2.QtWidgets import QApplication
 from PySide2.QtWebKit import QWebView
diff --git a/sources/pyside2/tests/QtWebKit/bug_694.py b/sources/pyside2/tests/QtWebKit/bug_694.py
index 60fb37f84..b18d658f6 100644
--- a/sources/pyside2/tests/QtWebKit/bug_694.py
+++ b/sources/pyside2/tests/QtWebKit/bug_694.py
@@ -26,8 +26,14 @@
 ##
 #############################################################################
 
+import os
 import sys
 import unittest
+
+sys.path.append(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
+from init_paths import init_test_paths
+init_test_paths(False)
+
 from PySide2.QtCore import *
 from PySide2.QtWidgets import *
 from PySide2.QtWebKit import *
diff --git a/sources/pyside2/tests/QtWebKit/bug_803.py b/sources/pyside2/tests/QtWebKit/bug_803.py
index ea2b34ce2..ec6f93c33 100644
--- a/sources/pyside2/tests/QtWebKit/bug_803.py
+++ b/sources/pyside2/tests/QtWebKit/bug_803.py
@@ -26,7 +26,14 @@
 ##
 #############################################################################
 
+import os
+import sys
 import unittest
+
+sys.path.append(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
+from init_paths import init_test_paths
+init_test_paths(False)
+
 from PySide2.QtWidgets import *
 from PySide2.QtWebKit import *
 
diff --git a/sources/pyside2/tests/QtWebKit/bug_899.py b/sources/pyside2/tests/QtWebKit/bug_899.py
index 817aeb6d5..cb8e76784 100644
--- a/sources/pyside2/tests/QtWebKit/bug_899.py
+++ b/sources/pyside2/tests/QtWebKit/bug_899.py
@@ -26,10 +26,17 @@
 ##
 #############################################################################
 
+import os
+import sys
 import unittest
+
+sys.path.append(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
+from init_paths import init_test_paths
+init_test_paths(False)
+
 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 2ebfdbe99..5214ee1e1 100644
--- a/sources/pyside2/tests/QtWebKit/bug_959.py
+++ b/sources/pyside2/tests/QtWebKit/bug_959.py
@@ -31,10 +31,15 @@ from PySide2.QtWebKit import QWebView
 from PySide2.QtWidgets import QApplication
 from PySide2 import QtCore
 
+import os
 import sys
 import unittest
 
-from helper import UsesQApplication
+sys.path.append(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
+from init_paths import init_test_paths
+init_test_paths(False)
+
+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 586185418..33497bdc1 100644
--- a/sources/pyside2/tests/QtWebKit/qml_plugin_test.py
+++ b/sources/pyside2/tests/QtWebKit/qml_plugin_test.py
@@ -30,11 +30,15 @@ import os
 import sys
 import unittest
 
+sys.path.append(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
+from init_paths import init_test_paths
+init_test_paths(False)
+
 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 e98de7b87..6a51a6488 100644
--- a/sources/pyside2/tests/QtWebKit/qvariantlist_property_test.py
+++ b/sources/pyside2/tests/QtWebKit/qvariantlist_property_test.py
@@ -26,10 +26,17 @@
 ##
 #############################################################################
 
+import os
+import sys
 import unittest
+
+sys.path.append(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
+from init_paths import init_test_paths
+init_test_paths(False)
+
 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 b49fe13dd..4db5adbb5 100644
--- a/sources/pyside2/tests/QtWebKit/shouldInterruptjavascript_test.py
+++ b/sources/pyside2/tests/QtWebKit/shouldInterruptjavascript_test.py
@@ -29,10 +29,17 @@
 ##
 #############################################################################
 
+import os
+import sys
 import unittest
+
+sys.path.append(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
+from init_paths import init_test_paths
+init_test_paths(False)
+
 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 4aea6709a..d46c1b229 100644
--- a/sources/pyside2/tests/QtWebKit/webframe_test.py
+++ b/sources/pyside2/tests/QtWebKit/webframe_test.py
@@ -26,15 +26,20 @@
 ##
 #############################################################################
 
-import unittest
+import os
 import sys
+import unittest
+
+sys.path.append(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
+from init_paths import init_test_paths
+init_test_paths(False)
 
 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 95cd307d5..0c37befa2 100644
--- a/sources/pyside2/tests/QtWebKit/webpage_test.py
+++ b/sources/pyside2/tests/QtWebKit/webpage_test.py
@@ -28,13 +28,20 @@
 
 '''Test cases for QWebPage'''
 
+import os
+import sys
 import unittest
 
+sys.path.append(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
+from init_paths import init_test_paths
+init_test_paths(False)
+
 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 ce7a3a7bf..5ecac5387 100644
--- a/sources/pyside2/tests/QtWebKit/webview_test.py
+++ b/sources/pyside2/tests/QtWebKit/webview_test.py
@@ -28,15 +28,22 @@
 
 '''Test cases for QWebView'''
 
+import os
+import sys
 import unittest
+
+sys.path.append(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
+from init_paths import init_test_paths
+init_test_paths(False)
+
 import py3kcompat as py3k
-import sys
 
 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):