Squish: catch plugin loader error if it occurs

...and stop execution of the current test case

Change-Id: I46ac21e79f643f6890b7303d08c204dcd9fa9386
Reviewed-by: Robert Loehning <robert.loehning@digia.com>

9 files changed, 18 insertions, 0 deletions

diff --git a/tests/system/suite_editors/tst_basic_cpp_support/test.py b/tests/system/suite_editors/tst_basic_cpp_support/test.py
index bf27d2c6ec..14cf127eae 100644
--- a/tests/system/suite_editors/tst_basic_cpp_support/test.py
+++ b/tests/system/suite_editors/tst_basic_cpp_support/test.py
@@ -14,6 +14,8 @@ def main():
     cleanUpUserFiles(proFile)
 
     startApplication("qtcreator" + SettingsPath)
+    if not startedWithoutPluginError():
+        return
     overrideInstallLazySignalHandler()
     installLazySignalHandler(":Qt Creator_CppEditor::Internal::CPPEditorWidget", "textChanged()",
                              "__handleTextChanged__")
diff --git a/tests/system/suite_editors/tst_delete_externally/test.py b/tests/system/suite_editors/tst_delete_externally/test.py
index 7dce3cce51..abbd7d7ca1 100644
--- a/tests/system/suite_editors/tst_delete_externally/test.py
+++ b/tests/system/suite_editors/tst_delete_externally/test.py
@@ -26,6 +26,8 @@ def main():
     files = map(copyToTemplateDir, files)
 
     startApplication("qtcreator" + SettingsPath)
+    if not startedWithoutPluginError():
+        return
     for currentFile in files:
         test.log("Opening file %s" % currentFile)
         invokeMenuItem("File", "Open File or Project...")
diff --git a/tests/system/suite_editors/tst_memberoperator/test.py b/tests/system/suite_editors/tst_memberoperator/test.py
index 7e329ba900..ea69df7761 100644
--- a/tests/system/suite_editors/tst_memberoperator/test.py
+++ b/tests/system/suite_editors/tst_memberoperator/test.py
@@ -2,6 +2,8 @@ source("../../shared/qtcreator.py")
 
 def main():
     startApplication("qtcreator" + SettingsPath)
+    if not startedWithoutPluginError():
+        return
     createProject_Qt_Console(tempDir(), "SquishProject")
     selectFromLocator("main.cpp")
     cppwindow = waitForObject(":Qt Creator_CppEditor::Internal::CPPEditorWidget")
diff --git a/tests/system/suite_editors/tst_modify_readonly/test.py b/tests/system/suite_editors/tst_modify_readonly/test.py
index 338ad2c112..ddbb876091 100644
--- a/tests/system/suite_editors/tst_modify_readonly/test.py
+++ b/tests/system/suite_editors/tst_modify_readonly/test.py
@@ -12,6 +12,8 @@ def main():
     if not changeFilePermissions(testFolder, True, False, "testfiles.pro"):
         test.fatal("Could not set permissions for files to read-only - test will likely fail.")
     startApplication("qtcreator" + SettingsPath)
+    if not startedWithoutPluginError():
+        return
     openQmakeProject(os.path.join(testFolder, "testfiles.pro"))
     modifiedUnsaved = []
     readOnlyFiles = []
diff --git a/tests/system/suite_editors/tst_qml_editor/test.py b/tests/system/suite_editors/tst_qml_editor/test.py
index 57080c3ac1..b2d07d4c86 100644
--- a/tests/system/suite_editors/tst_qml_editor/test.py
+++ b/tests/system/suite_editors/tst_qml_editor/test.py
@@ -10,6 +10,8 @@ def main():
     if not neededFilePresent(os.path.join(sourceExample, qmlFile)):
         return
     startApplication("qtcreator" + SettingsPath)
+    if not startedWithoutPluginError():
+        return
     # add docs to have the correct tool tips
     addHelpDocumentationFromSDK()
     templateDir = prepareTemplate(sourceExample)
diff --git a/tests/system/suite_editors/tst_qml_indent/test.py b/tests/system/suite_editors/tst_qml_indent/test.py
index 9cdebd2174..d61e4cca8c 100644
--- a/tests/system/suite_editors/tst_qml_indent/test.py
+++ b/tests/system/suite_editors/tst_qml_indent/test.py
@@ -2,6 +2,8 @@ source("../../shared/qtcreator.py")
 
 def main():
     startApplication("qtcreator" + SettingsPath)
+    if not startedWithoutPluginError():
+        return
     # using a temporary directory won't mess up a potentially exisiting
     createNewQtQuickApplication(tempDir(), "untitled")
     if not prepareQmlFile():
diff --git a/tests/system/suite_editors/tst_rename_macros/test.py b/tests/system/suite_editors/tst_rename_macros/test.py
index bdd71e118b..f739b99aa8 100644
--- a/tests/system/suite_editors/tst_rename_macros/test.py
+++ b/tests/system/suite_editors/tst_rename_macros/test.py
@@ -11,6 +11,8 @@ def main():
         return
     proFile = os.path.join(folder, "testfiles.pro")
     startApplication("qtcreator" + SettingsPath)
+    if not startedWithoutPluginError():
+        return
     openQmakeProject(proFile)
     if not testRenameMacroAfterSourceModification():
         return
diff --git a/tests/system/suite_editors/tst_revert_changes/test.py b/tests/system/suite_editors/tst_revert_changes/test.py
index afe11dde78..2361086c47 100644
--- a/tests/system/suite_editors/tst_revert_changes/test.py
+++ b/tests/system/suite_editors/tst_revert_changes/test.py
@@ -21,6 +21,8 @@ def main():
         return
     proFile = os.path.join(folder, "testfiles.pro")
     startApplication("qtcreator" + SettingsPath)
+    if not startedWithoutPluginError():
+        return
     openQmakeProject(proFile)
     fileModifications = {"testfiles.testfiles\\.pro":__modifyProFile__,
                          "testfiles.Headers.testfile\\.h":__modifyHeader__,
diff --git a/tests/system/suite_editors/tst_select_all/test.py b/tests/system/suite_editors/tst_select_all/test.py
index 2705df72c5..ddfeea6d91 100644
--- a/tests/system/suite_editors/tst_select_all/test.py
+++ b/tests/system/suite_editors/tst_select_all/test.py
@@ -17,6 +17,8 @@ def main():
             return
 
     startApplication("qtcreator" + SettingsPath)
+    if not startedWithoutPluginError():
+        return
     for currentFile in files:
         test.log("Opening file %s" % currentFile)
         size = charactersInFile(currentFile)