diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2024-04-17 12:48:28 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2024-04-17 13:29:02 +0200 |
| commit | 0fe73503688c6c4c256ffa39f1a30c329a5ca2e7 (patch) | |
| tree | f35e6772a7742155ec62c084dd607a3027216795 /tests | |
| parent | 1f162377369d968cd7740d751bc41047591dbe0d (diff) | |
| parent | d4d8ea98b75545f99477d2b6a4c6aaaa1b354891 (diff) | |
Merge remote-tracking branch 'origin/13.0'
Change-Id: I0892d8e54930bb5a65dc51117b8ca7d70ce300a3
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/system/shared/project.py | 2 | ||||
| -rw-r--r-- | tests/system/suite_tools/tst_git_local/test.py | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/tests/system/shared/project.py b/tests/system/shared/project.py index a45d78cfc4..2ff44dc373 100644 --- a/tests/system/shared/project.py +++ b/tests/system/shared/project.py @@ -524,7 +524,7 @@ def __getSupportedPlatforms__(text, templateName, getAsStrings=False, ignoreVali version = res.group("version") else: version = None - if templateName == "Qt Quick Application": + if templateName in ("Qt Quick 2 Extension Plugin", "Qt Quick Application"): result = set([Targets.DESKTOP_6_2_4]) elif 'Supported Platforms' in text: supports = text[text.find('Supported Platforms'):].split(":")[1].strip().split("\n") diff --git a/tests/system/suite_tools/tst_git_local/test.py b/tests/system/suite_tools/tst_git_local/test.py index aefdc07d9a..c74ad6e20c 100644 --- a/tests/system/suite_tools/tst_git_local/test.py +++ b/tests/system/suite_tools/tst_git_local/test.py @@ -82,7 +82,8 @@ def __clickCommit__(count): test.verify(waitFor('str(fileName.currentText) == expected', 5000), "Verifying editor switches to Git Show.") description = waitForObject(":Qt Creator_DiffEditor::Internal::DescriptionEditorWidget") - waitFor('len(str(description.plainText)) != 0', 5000) + waitFor('len(str(description.plainText)) != 0 ' + 'and str(description.plainText) != "Waiting for data..."', 5000) show = str(description.plainText) id = "Nobody <nobody@nowhere\.com>" time = "\w{3} \w{3} \d{1,2} \d{2}:\d{2}:\d{2} \d{4}.* seconds ago\)" |