diff options
| author | Robert Loehning <robert.loehning@qt.io> | 2017-04-25 16:34:28 +0200 |
|---|---|---|
| committer | Robert Loehning <robert.loehning@qt.io> | 2017-05-02 10:31:24 +0000 |
| commit | 4ea64b902e4ad44fc3f252afac891d25c0211f9e (patch) | |
| tree | ef919591120a30e2e4ff989dd43d0c68cc658108 /tests/system/suite_HELP | |
| parent | 1e9cc97220ef25f164bb4316badae6754f85dc30 (diff) | |
| download | qt-creator-4ea64b902e4ad44fc3f252afac891d25c0211f9e.tar.gz | |
Squish: Update tst_HELP02 to use QTCREATOR_DISPLAY_VERSION
Change-Id: I7cffa591f036ea7ff1803a49a605030612dd787b
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Diffstat (limited to 'tests/system/suite_HELP')
| -rwxr-xr-x | tests/system/suite_HELP/tst_HELP02/test.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/tests/system/suite_HELP/tst_HELP02/test.py b/tests/system/suite_HELP/tst_HELP02/test.py index 1887868672..4f59878a14 100755 --- a/tests/system/suite_HELP/tst_HELP02/test.py +++ b/tests/system/suite_HELP/tst_HELP02/test.py @@ -27,7 +27,7 @@ source("../../shared/qtcreator.py") # test Qt Creator version information from file and dialog def getQtCreatorVersionFromDialog(): - chk = re.search("(?<=Qt Creator)\s\d+.\d+.\d+", + chk = re.search("(?<=Qt Creator)\s\d+.\d+.\d+\S*", str(waitForObject("{text?='*Qt Creator*' type='QLabel' unnamed='1' visible='1' " "window=':About Qt Creator_Core::Internal::VersionDialog'}").text)) try: @@ -41,7 +41,7 @@ def getQtCreatorVersionFromFile(): qtCreatorPriFileName = "../../../../qtcreator.pri" # open file <qtCreatorPriFileName> and read version fileText = readFile(qtCreatorPriFileName) - chk = re.search("(?<=QTCREATOR_VERSION =)\s\d+.\d+.\d+", fileText) + chk = re.search("(?<=QTCREATOR_DISPLAY_VERSION =)\s\d+.\d+.\d+\S*", fileText) try: ver = chk.group(0).strip() return ver @@ -122,9 +122,9 @@ def main(): invokeMenuItem("Help", "About Qt Creator...") waitForObject(":About Qt Creator_Core::Internal::VersionDialog", 5000) actualVersion = getQtCreatorVersionFromDialog() - test.verify(actualVersion == expectedVersion, - "Verifying version. Current version is '%s', expected version is '%s'" - % (actualVersion, expectedVersion)) + test.compare(actualVersion, expectedVersion, + "Verifying version. Current version is '%s', expected version is '%s'" + % (actualVersion, expectedVersion)) # close and verify about dialog closed clickButton(waitForObject("{text='Close' type='QPushButton' unnamed='1' visible='1' " "window=':About Qt Creator_Core::Internal::VersionDialog'}")) |