From 6838be76aa1554d45e0aa05a1c780bba5ecdde1e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20L=C3=B6hning?= Date: Thu, 4 Apr 2024 23:27:39 +0200 Subject: SquishTests: Fix wait condition in tst_git_local Change-Id: I401e3c8f8f2743ff9b108d3e25693f834d61e8ac Reviewed-by: Christian Stenger --- tests/system/suite_tools/tst_git_local/test.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'tests') diff --git a/tests/system/suite_tools/tst_git_local/test.py b/tests/system/suite_tools/tst_git_local/test.py index aefdc07d9a1..c74ad6e20cf 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 " time = "\w{3} \w{3} \d{1,2} \d{2}:\d{2}:\d{2} \d{4}.* seconds ago\)" -- cgit v1.2.3 From 00ac4b7ccc85c73a1db3927212489b458203fc8e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20L=C3=B6hning?= Date: Thu, 11 Apr 2024 16:10:22 +0200 Subject: SquishTests: Fix supported platforms for Qt Quick 2 Extension Plugin Change-Id: I3accd8f43c5cace3145aacff28ef068ff20ecea2 Reviewed-by: Christian Stenger Reviewed-by: --- tests/system/shared/project.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tests') diff --git a/tests/system/shared/project.py b/tests/system/shared/project.py index a45d78cfc4b..2ff44dc3737 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") -- cgit v1.2.3