From 23fcc1a82399051902c6ab853bfafecc20744b2e Mon Sep 17 00:00:00 2001
From: Robert Loehning <robert.loehning@nokia.com>
Date: Wed, 30 May 2012 15:33:01 +0200
Subject: [PATCH] Squish: Small improvements
Hoping to fix some fails on Mac
Change-Id: I5e9f47f0714b14a6b87df342de74e7fd41fe94b0
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
---
tests/system/shared/utils.py | 2 +-
tests/system/suite_general/tst_select_all/test.py | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/tests/system/shared/utils.py b/tests/system/shared/utils.py
index ca971c6842a..7e6ba8eb0d2 100644
--- a/tests/system/shared/utils.py
+++ b/tests/system/shared/utils.py
@@ -31,7 +31,7 @@ def ensureChecked(objectName, shouldBeChecked = True):
else:
state = "unchecked"
test.log("New state for QCheckBox: %s" % state)
- test.verify(object.checked == shouldBeChecked)
+ test.verify(waitFor("object.checked == shouldBeChecked", 1000))
return object
# verify that an object is in an expected enable state. Returns the object.
diff --git a/tests/system/suite_general/tst_select_all/test.py b/tests/system/suite_general/tst_select_all/test.py
index be6ddf92aba..fda92a3ccfe 100644
--- a/tests/system/suite_general/tst_select_all/test.py
+++ b/tests/system/suite_general/tst_select_all/test.py
@@ -35,7 +35,7 @@ def main():
test.compare(editor.textCursor().selectionStart(), 0)
test.compare(editor.textCursor().selectionEnd(), size)
test.compare(editor.textCursor().position(), size)
- test.log("Pressing key %s" % key)
+ test.log("Pressing key: %s" % key.replace("<", "").replace(">", ""))
type(editor, key)
if key == "<Up>":
test.compare(editor.textCursor().selectionStart(), editor.textCursor().selectionEnd())
@@ -43,7 +43,7 @@ def main():
pos = size
if key == "<Left>":
pos -= 1
- if platform.system() != 'Darwin' and JIRA.isBugStillOpen(7215, JIRA.Bug.CREATOR):
+ if JIRA.isBugStillOpen(7215, JIRA.Bug.CREATOR):
test.warning("Using workaround for %s-%d" % (JIRA.Bug.CREATOR, 7215))
pos = 0
test.compare(editor.textCursor().selectionStart(), pos)
--
GitLab