Squish: Wait for a clean shutdown when restarting QC

This fixes a race condition in tst_CSUP06 where the next run
of QC removed .user* but the first instance was not completely
finished with the shutdown process. The .user files of the project
got updated (or recreated) before the second instance tried to
open the same project again. Ensure the first instance is closed
to be sure that project's .user files got created or updated
before the second instance tries to remove and re-open them.
Follow the same approach for other tests to avoid the same issue
later on.

Change-Id: I37721f4dd647f9bbf7c6fed6e753a2906e30db81
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
This commit is contained in:
Christian Stenger
2018-09-07 08:26:01 +02:00
parent 1a64efd863
commit 28ab852e53
7 changed files with 7 additions and 0 deletions
@@ -133,3 +133,4 @@ def main():
# exit qt creator
invokeMenuItem("File", "Save All")
invokeMenuItem("File", "Exit")
waitForCleanShutdown()
@@ -87,3 +87,4 @@ def main():
invokeMenuItem('File', 'Close "main.cpp"')
# exit qt creator
invokeMenuItem("File", "Exit")
waitForCleanShutdown()
@@ -123,3 +123,4 @@ def main():
snooze(1) # "Close All" might be disabled
invokeMenuItem('File', 'Close All')
invokeMenuItem('File', 'Exit')
waitForCleanShutdown()
@@ -78,3 +78,4 @@ def main():
validateSearchResult(5 if JIRA.isBugStillOpen(2863) else 3)
invokeMenuItem("File", "Close All")
invokeMenuItem("File", "Exit")
waitForCleanShutdown()
@@ -94,3 +94,4 @@ def main():
invokeMenuItem("File", "Close All")
clickButton(waitForObject(":Save Changes.Do not Save_QPushButton"))
invokeMenuItem("File", "Exit")
waitForCleanShutdown()
@@ -181,3 +181,4 @@ def main():
# 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()
@@ -54,3 +54,4 @@ def main():
snooze(1)
invokeMenuItem("File", "Close All")
invokeMenuItem("File", "Exit")
waitForCleanShutdown()