diff options
| author | Christian Stenger <christian.stenger@qt.io> | 2018-09-07 08:26:01 +0200 |
|---|---|---|
| committer | Christian Stenger <christian.stenger@qt.io> | 2018-09-07 12:48:28 +0000 |
| commit | 28ab852e538643a0762ce6be5b0fee1daa41f3a9 (patch) | |
| tree | f4e951d58c4f507aabf4922bb00120e7d4e1f98c | |
| parent | 1a64efd863507e47d161c82b2ffbae31c88ed452 (diff) | |
| download | qt-creator-28ab852e538643a0762ce6be5b0fee1daa41f3a9.tar.gz | |
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>
| -rw-r--r-- | tests/system/suite_CSUP/tst_CSUP01/test.py | 1 | ||||
| -rw-r--r-- | tests/system/suite_CSUP/tst_CSUP02/test.py | 1 | ||||
| -rw-r--r-- | tests/system/suite_CSUP/tst_CSUP03/test.py | 1 | ||||
| -rw-r--r-- | tests/system/suite_CSUP/tst_CSUP04/test.py | 1 | ||||
| -rw-r--r-- | tests/system/suite_CSUP/tst_CSUP05/test.py | 1 | ||||
| -rw-r--r-- | tests/system/suite_CSUP/tst_CSUP06/test.py | 1 | ||||
| -rw-r--r-- | tests/system/suite_editors/tst_memberoperator/test.py | 1 |
7 files changed, 7 insertions, 0 deletions
diff --git a/tests/system/suite_CSUP/tst_CSUP01/test.py b/tests/system/suite_CSUP/tst_CSUP01/test.py index 1031ce75dc..63779811f6 100644 --- a/tests/system/suite_CSUP/tst_CSUP01/test.py +++ b/tests/system/suite_CSUP/tst_CSUP01/test.py @@ -133,3 +133,4 @@ def main(): # exit qt creator invokeMenuItem("File", "Save All") invokeMenuItem("File", "Exit") + waitForCleanShutdown() diff --git a/tests/system/suite_CSUP/tst_CSUP02/test.py b/tests/system/suite_CSUP/tst_CSUP02/test.py index f44f9bc093..147f1b0935 100644 --- a/tests/system/suite_CSUP/tst_CSUP02/test.py +++ b/tests/system/suite_CSUP/tst_CSUP02/test.py @@ -87,3 +87,4 @@ def main(): invokeMenuItem('File', 'Close "main.cpp"') # exit qt creator invokeMenuItem("File", "Exit") + waitForCleanShutdown() diff --git a/tests/system/suite_CSUP/tst_CSUP03/test.py b/tests/system/suite_CSUP/tst_CSUP03/test.py index 90e60322fc..7565af2830 100644 --- a/tests/system/suite_CSUP/tst_CSUP03/test.py +++ b/tests/system/suite_CSUP/tst_CSUP03/test.py @@ -123,3 +123,4 @@ def main(): snooze(1) # "Close All" might be disabled invokeMenuItem('File', 'Close All') invokeMenuItem('File', 'Exit') + waitForCleanShutdown() diff --git a/tests/system/suite_CSUP/tst_CSUP04/test.py b/tests/system/suite_CSUP/tst_CSUP04/test.py index c910de02b5..6fc59a3caa 100644 --- a/tests/system/suite_CSUP/tst_CSUP04/test.py +++ b/tests/system/suite_CSUP/tst_CSUP04/test.py @@ -78,3 +78,4 @@ def main(): validateSearchResult(5 if JIRA.isBugStillOpen(2863) else 3) invokeMenuItem("File", "Close All") invokeMenuItem("File", "Exit") + waitForCleanShutdown() diff --git a/tests/system/suite_CSUP/tst_CSUP05/test.py b/tests/system/suite_CSUP/tst_CSUP05/test.py index e24d80ebf9..62be1a02e1 100644 --- a/tests/system/suite_CSUP/tst_CSUP05/test.py +++ b/tests/system/suite_CSUP/tst_CSUP05/test.py @@ -94,3 +94,4 @@ def main(): invokeMenuItem("File", "Close All") clickButton(waitForObject(":Save Changes.Do not Save_QPushButton")) invokeMenuItem("File", "Exit") + waitForCleanShutdown() diff --git a/tests/system/suite_CSUP/tst_CSUP06/test.py b/tests/system/suite_CSUP/tst_CSUP06/test.py index 4cdb74c53e..9e094b0a0d 100644 --- a/tests/system/suite_CSUP/tst_CSUP06/test.py +++ b/tests/system/suite_CSUP/tst_CSUP06/test.py @@ -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() diff --git a/tests/system/suite_editors/tst_memberoperator/test.py b/tests/system/suite_editors/tst_memberoperator/test.py index 3b3133af9d..d7b20f8b3d 100644 --- a/tests/system/suite_editors/tst_memberoperator/test.py +++ b/tests/system/suite_editors/tst_memberoperator/test.py @@ -54,3 +54,4 @@ def main(): snooze(1) invokeMenuItem("File", "Close All") invokeMenuItem("File", "Exit") + waitForCleanShutdown() |