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

Squish: Don't close files before exiting Creator

Browse Source 
It's not needed and it's fragile since
the menu item is disabled at times.

Change-Id: I0c72c5072374462d99740e7eaa752f91e019c6ee
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
Robert Loehning
2020-03-31 20:39:17 +02:00
parent 1e9a91e7d1
commit da558f3376
7 changed files with 1 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tests/system/suite_CSUP/tst_CSUP02/test.py
View File

@@ -88,9 +88,5 @@ def main():
"- Content of editor:\n%s" % editorWidget.plainText)
invokeMenuItem('File', 'Revert "main.cpp" to Saved')
clickButton(waitForObject(":Revert to Saved.Proceed_QPushButton"))
snooze(1) # 'Close "main.cpp"' might still be disabled
# editor must be closed to get the second code model applied on re-opening the file
invokeMenuItem('File', 'Close "main.cpp"')
# exit qt creator
invokeMenuItem("File", "Exit")
waitForCleanShutdown()

2
tests/system/suite_CSUP/tst_CSUP03/test.py
View File

@@ -120,7 +120,5 @@ def main():
test.compare(modifiedCode, expectedCode, "Verifying whether code matches expected.")
# reverting to initial state of main.cpp
revertMainCpp()
snooze(1) # "Close All" might be disabled
invokeMenuItem('File', 'Close All')
invokeMenuItem('File', 'Exit')
waitForCleanShutdown()

1
tests/system/suite_CSUP/tst_CSUP04/test.py
View File

@@ -76,6 +76,5 @@ def main():
# wait until search finished and verify search results
waitForSearchResults()
validateSearchResult(5 if JIRA.isBugStillOpen(2863) else 3)
invokeMenuItem("File", "Close All")
invokeMenuItem("File", "Exit")
waitForCleanShutdown()

3
tests/system/suite_CSUP/tst_CSUP05/test.py
View File

@@ -91,7 +91,6 @@ def main():
clickButton(waitForObject(":Qt Creator.CloseFind_QToolButton"))
test.verify(checkIfObjectExists(":*Qt Creator.Find_Find::Internal::FindToolBar", False),
"Verifying if: Find/Replace tab is closed.")
invokeMenuItem("File", "Close All")
clickButton(waitForObject(":Save Changes.Do not Save_QPushButton"))
invokeMenuItem("File", "Exit")
clickButton(waitForObject(":Save Changes.Do not Save_QPushButton"))
waitForCleanShutdown()

3
tests/system/suite_CSUP/tst_CSUP06/test.py
View File

@@ -172,8 +172,5 @@ def main():
checkSymbolCompletion(editor, useClang)
invokeMenuItem('File', 'Revert "main.cpp" to Saved')
clickButton(waitForObject(":Revert to Saved.Proceed_QPushButton"))
snooze(1) # 'Close "main.cpp"' might still be disabled
# editor must be closed to get the second code model applied on re-opening the file
invokeMenuItem('File', 'Close "main.cpp"')
invokeMenuItem("File", "Exit")
waitForCleanShutdown()

2
tests/system/suite_editors/tst_memberoperator/test.py
View File

@@ -96,7 +96,5 @@ def main():
__verifyLineUnderCursor__(cppwindow, record)
invokeMenuItem("File", 'Revert "main.cpp" to Saved')
clickButton(waitForObject(":Revert to Saved.Proceed_QPushButton"))
snooze(1)
invokeMenuItem("File", "Close All")
invokeMenuItem("File", "Exit")
waitForCleanShutdown()

2
tests/system/suite_tools/tst_git_local/test.py
View File

@@ -226,8 +226,6 @@ def main():
waitFor('str(changed.plainText) != "Waiting for data..."', 5000)
test.compare(str(changed.plainText), "Retrieving data failed.",
"Showing an invalid commit can't succeed but Creator survived.")
invokeMenuItem("File", "Close All Projects and Editors")
invokeMenuItem("File", "Exit")
def deleteProject():