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

SquishTests: Fix using invalid paste IDs

Browse Source 
Change-Id: Ibc48506ff1632cbfe8d662cd00ed057af7d16a6a
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
Robert Löhning
2023-05-10 17:28:35 +02:00
parent 948dc6b37e
commit a820b5490c
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tests/system/suite_tools/tst_codepasting/test.py
View File

@@ -107,7 +107,7 @@ def fetchSnippet(protocol, description, pasteId, skippedPasting):
pasteModel = waitForObject(":PasteSelectDialog.listWidget_QListWidget").model() pasteModel = waitForObject(":PasteSelectDialog.listWidget_QListWidget").model()
except: except:
closeHTTPStatusAndPasterDialog(protocol, ':PasteSelectDialog_CodePaster::PasteSelectDialog') closeHTTPStatusAndPasterDialog(protocol, ':PasteSelectDialog_CodePaster::PasteSelectDialog')
return -1 return invalidPasteId(protocol)
condition = "pasteModel.rowCount() > 1" condition = "pasteModel.rowCount() > 1"
if protocol == NAME_DPCOM: # no list support if protocol == NAME_DPCOM: # no list support
@@ -125,7 +125,7 @@ def fetchSnippet(protocol, description, pasteId, skippedPasting):
"window=':PasteSelectDialog_CodePaster::PasteSelectDialog'}") "window=':PasteSelectDialog_CodePaster::PasteSelectDialog'}")
waitFor("pasteModel.rowCount() == 1", 1000) waitFor("pasteModel.rowCount() == 1", 1000)
waitFor("pasteModel.rowCount() > 1", 20000) waitFor("pasteModel.rowCount() > 1", 20000)
if pasteId == -1: if pasteId == invalidPasteId(protocol):
try: try:
pasteLine = filter(lambda str:description in str, dumpItems(pasteModel))[0] pasteLine = filter(lambda str:description in str, dumpItems(pasteModel))[0]
pasteId = pasteLine.split(" ", 1)[0] pasteId = pasteLine.split(" ", 1)[0]
@@ -207,7 +207,7 @@ def main():
test.fatal(message) test.fatal(message)
continue continue
pasteId = fetchSnippet(protocol, description, pasteId, skippedPasting) pasteId = fetchSnippet(protocol, description, pasteId, skippedPasting)
if pasteId == -1: if pasteId == invalidPasteId(protocol):
continue continue
filenameCombo = waitForObject(":Qt Creator_FilenameQComboBox") filenameCombo = waitForObject(":Qt Creator_FilenameQComboBox")
waitFor("not filenameCombo.currentText.isEmpty()", 20000) waitFor("not filenameCombo.currentText.isEmpty()", 20000)