From 4cb18ded74ed001369e032d90b0a9b1be0429849 Mon Sep 17 00:00:00 2001 From: Christian Stenger Date: Wed, 20 Mar 2024 15:24:19 +0100 Subject: [PATCH] SquishTests: Stabilize welcome page related tests MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I3596f2d1f7ca2de27a25075309ccb6015a1bb619 Reviewed-by: Robert Löhning --- tests/system/suite_WELP/tst_WELP01/test.py | 3 ++- tests/system/suite_general/tst_session_handling/test.py | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/tests/system/suite_WELP/tst_WELP01/test.py b/tests/system/suite_WELP/tst_WELP01/test.py index 61ee8a6030b..8385c33fa96 100644 --- a/tests/system/suite_WELP/tst_WELP01/test.py +++ b/tests/system/suite_WELP/tst_WELP01/test.py @@ -14,8 +14,9 @@ def clickItemVerifyHelpCombo(button, expectedHelpComboRegex, testDetails): test.log("Found %s" % str(helpCombo.currentText)) # select "Welcome" page from left toolbar again switchViewTo(ViewConstants.WELCOME) - return test.verify(object.exists(getWelcomeScreenSideBarButton(getStarted)), + return test.verify(checkIfObjectExists(getWelcomeScreenSideBarButton(getStarted), timeout=1000), "Verifying: '%s' button is being displayed." % getStarted) + def buttonActive(button): return waitForObject(button).checked diff --git a/tests/system/suite_general/tst_session_handling/test.py b/tests/system/suite_general/tst_session_handling/test.py index 305d64895ea..20b4ae51bb1 100644 --- a/tests/system/suite_general/tst_session_handling/test.py +++ b/tests/system/suite_general/tst_session_handling/test.py @@ -85,7 +85,7 @@ def createAndSwitchToSession(toSession): def checkWelcomePage(sessionName, isCurrent=False): switchViewTo(ViewConstants.WELCOME) wsButton = getWelcomeScreenSideBarButton('Projects') - if not object.exists(wsButton): + if not checkIfObjectExists(wsButton, timeout=1000): test.fatal("Something's pretty wrong - leaving check for WelcomePage.") return mouseClick(wsButton)