feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

SquishTests: Don't try removing packages directories

Browse Source 
Seems they are not being created anymore.

Change-Id: I8b48a848793fb73ea193918c14c322d6166b2053
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
Robert Löhning
2024-03-07 09:47:43 +01:00
parent 71a02b4f02
commit 498625520a
2 changed files with 0 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
tests/system/shared/utils.py
View File

@@ -464,13 +464,6 @@ def setFixedHelpViewer(helpViewer):
selectFromCombo(":Startup.contextHelpComboBox_QComboBox", mode) selectFromCombo(":Startup.contextHelpComboBox_QComboBox", mode)
clickButton(waitForObject(":Options.OK_QPushButton")) 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 # returns the indices from a QAbstractItemModel
def dumpIndices(model, parent=None, column=0): def dumpIndices(model, parent=None, column=0):

10
tests/system/suite_WELP/tst_WELP03/test.py
View File

@@ -83,8 +83,6 @@ def main():
proFiles = [os.path.join(p, "opengl", "2dpainting", "2dpainting.pro") proFiles = [os.path.join(p, "opengl", "2dpainting", "2dpainting.pro")
for p in QtPath.getPaths(QtPath.EXAMPLES)] for p in QtPath.getPaths(QtPath.EXAMPLES)]
cleanUpUserFiles(proFiles) cleanUpUserFiles(proFiles)
for p in proFiles:
removePackagingDirectory(os.path.dirname(p))
example = openExample(examplesLineEdit, "2d painting", "2D Painting.*", "2D Painting Example") example = openExample(examplesLineEdit, "2d painting", "2D Painting.*", "2D Painting Example")
if example is not None: if example is not None:
@@ -96,17 +94,12 @@ def main():
waitFor("navTree.model().rowCount(navTree.rootIndex()) == 0", 2000) waitFor("navTree.model().rowCount(navTree.rootIndex()) == 0", 2000)
test.verify(not checkIfObjectItemExists(":Qt Creator_Utils::NavigationTreeView", "2dpainting"), test.verify(not checkIfObjectItemExists(":Qt Creator_Utils::NavigationTreeView", "2dpainting"),
"Verifying: The first example is closed.") "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 # go to "Welcome" page and choose another example
switchViewTo(ViewConstants.WELCOME) switchViewTo(ViewConstants.WELCOME)
proFiles = [os.path.join(p, "widgets", "itemviews", "addressbook", "addressbook.pro") proFiles = [os.path.join(p, "widgets", "itemviews", "addressbook", "addressbook.pro")
for p in QtPath.getPaths(QtPath.EXAMPLES)] for p in QtPath.getPaths(QtPath.EXAMPLES)]
cleanUpUserFiles(proFiles) cleanUpUserFiles(proFiles)
for p in proFiles:
removePackagingDirectory(os.path.dirname(p))
examplesLineEdit = waitForObject(search %(expect[1][0], expect[1][1])) examplesLineEdit = waitForObject(search %(expect[1][0], expect[1][1]))
example = openExample(examplesLineEdit, "address book", "(0000 )?Address Book.*", example = openExample(examplesLineEdit, "address book", "(0000 )?Address Book.*",
"Address Book Example", 3) "Address Book Example", 3)
@@ -122,8 +115,5 @@ def main():
waitFor("navTree.model().rowCount(navTree.rootIndex()) == 0", 2000) waitFor("navTree.model().rowCount(navTree.rootIndex()) == 0", 2000)
test.verify(not checkIfObjectItemExists(":Qt Creator_Utils::NavigationTreeView", "addressbook"), test.verify(not checkIfObjectItemExists(":Qt Creator_Utils::NavigationTreeView", "addressbook"),
"Verifying: The second example is closed.") "Verifying: The second example is closed.")
# clean up created packaging directories
for p in proFiles:
removePackagingDirectory(os.path.dirname(p))
# exit Qt Creator # exit Qt Creator
invokeMenuItem("File", "Exit") invokeMenuItem("File", "Exit")