diff options
author | Robert Löhning <robert.loehning@qt.io> | 2024-03-07 09:47:43 +0100 |
---|---|---|
committer | Robert Löhning <robert.loehning@qt.io> | 2024-03-07 11:12:04 +0000 |
commit | 498625520a0e32e2f5b18754a0351997d7767ecf (patch) | |
tree | cc2d176a3a4d0cf2c523f55e08d3fc77dd8df445 /tests/system | |
parent | 71a02b4f02fb3422e3873f351572d71229a92ebf (diff) |
SquishTests: Don't try removing packages directories
Seems they are not being created anymore.
Change-Id: I8b48a848793fb73ea193918c14c322d6166b2053
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Diffstat (limited to 'tests/system')
-rw-r--r-- | tests/system/shared/utils.py | 7 | ||||
-rw-r--r-- | tests/system/suite_WELP/tst_WELP03/test.py | 10 |
2 files changed, 0 insertions, 17 deletions
diff --git a/tests/system/shared/utils.py b/tests/system/shared/utils.py index 853c5f6fde..2e4b5a1dae 100644 --- a/tests/system/shared/utils.py +++ b/tests/system/shared/utils.py @@ -464,13 +464,6 @@ def setFixedHelpViewer(helpViewer): selectFromCombo(":Startup.contextHelpComboBox_QComboBox", mode) clickButton(waitForObject(":Options.OK_QPushButton")) -def removePackagingDirectory(projectPath): - qtcPackaging = os.path.join(projectPath, "qtc_packaging") - if os.path.exists(qtcPackaging): - test.log("Removing old packaging directory '%s'" % qtcPackaging) - deleteDirIfExists(qtcPackaging) - else: - test.log("Couldn't remove packaging directory '%s' - did not exist." % qtcPackaging) # returns the indices from a QAbstractItemModel def dumpIndices(model, parent=None, column=0): diff --git a/tests/system/suite_WELP/tst_WELP03/test.py b/tests/system/suite_WELP/tst_WELP03/test.py index 50f7b503cc..8d4fa29a9b 100644 --- a/tests/system/suite_WELP/tst_WELP03/test.py +++ b/tests/system/suite_WELP/tst_WELP03/test.py @@ -83,8 +83,6 @@ def main(): proFiles = [os.path.join(p, "opengl", "2dpainting", "2dpainting.pro") for p in QtPath.getPaths(QtPath.EXAMPLES)] cleanUpUserFiles(proFiles) - for p in proFiles: - removePackagingDirectory(os.path.dirname(p)) example = openExample(examplesLineEdit, "2d painting", "2D Painting.*", "2D Painting Example") if example is not None: @@ -96,17 +94,12 @@ def main(): waitFor("navTree.model().rowCount(navTree.rootIndex()) == 0", 2000) test.verify(not checkIfObjectItemExists(":Qt Creator_Utils::NavigationTreeView", "2dpainting"), "Verifying: The first example is closed.") - # clean up created packaging directories - for p in proFiles: - removePackagingDirectory(os.path.dirname(p)) # go to "Welcome" page and choose another example switchViewTo(ViewConstants.WELCOME) proFiles = [os.path.join(p, "widgets", "itemviews", "addressbook", "addressbook.pro") for p in QtPath.getPaths(QtPath.EXAMPLES)] cleanUpUserFiles(proFiles) - for p in proFiles: - removePackagingDirectory(os.path.dirname(p)) examplesLineEdit = waitForObject(search %(expect[1][0], expect[1][1])) example = openExample(examplesLineEdit, "address book", "(0000 )?Address Book.*", "Address Book Example", 3) @@ -122,8 +115,5 @@ def main(): waitFor("navTree.model().rowCount(navTree.rootIndex()) == 0", 2000) test.verify(not checkIfObjectItemExists(":Qt Creator_Utils::NavigationTreeView", "addressbook"), "Verifying: The second example is closed.") - # clean up created packaging directories - for p in proFiles: - removePackagingDirectory(os.path.dirname(p)) # exit Qt Creator invokeMenuItem("File", "Exit") |