diff options
| author | Christian Stenger <christian.stenger@qt.io> | 2016-05-24 15:23:46 +0200 |
|---|---|---|
| committer | Christian Stenger <christian.stenger@qt.io> | 2016-05-26 13:06:15 +0000 |
| commit | 3b820cc9a44feea59fafbb3053a137091dea168c (patch) | |
| tree | a46e4bd4c456afc7b72a33888eb6fdfadf8b6c25 | |
| parent | b2f869c4111087ead3caf672cd3088deefb35ff4 (diff) | |
| download | qt-creator-3b820cc9a44feea59fafbb3053a137091dea168c.tar.gz | |
Squish: Fix tst_installed_languages on OSX
Change-Id: I470047d663ec4c2bfebaa17baf67bc811d9c0c65
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
| -rw-r--r-- | tests/system/suite_general/tst_installed_languages/test.py | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/tests/system/suite_general/tst_installed_languages/test.py b/tests/system/suite_general/tst_installed_languages/test.py index ec7192ecd4..d4869559e9 100644 --- a/tests/system/suite_general/tst_installed_languages/test.py +++ b/tests/system/suite_general/tst_installed_languages/test.py @@ -42,6 +42,8 @@ def main(): selectFromCombo(":User Interface.languageBox_QComboBox", languageName) clickButton(waitForObject(":Options.OK_QPushButton")) clickButton(waitForObject(":Restart required.OK_QPushButton")) + test.verify(waitFor("not object.exists(':Options_Core::Internal::SettingsDialog')", 5000), + "Options dialog disappeared") invokeMenuItem("File", "Exit") waitForCleanShutdown() snooze(4) # wait for complete unloading of Creator @@ -49,16 +51,20 @@ def main(): startApplication("qtcreator" + SettingsPath) try: if platform.system() == 'Darwin': - # temporary hack for handling wrong menus when using Squish 5.0.1 with Qt5.2 - fileMenu = waitForObjectItem(":Qt Creator.QtCreator.MenuBar_QMenuBar", - testData.field(lang, "File")) - activateItem(fileMenu) - waitForObject("{type='QMenu' visible='1'}") - activateItem(fileMenu) + try: + fileMenu = waitForObjectItem(":Qt Creator.QtCreator.MenuBar_QMenuBar", + testData.field(lang, "File")) + activateItem(fileMenu) + obj = waitForObject("{type='QMenu' visible='1'}") + test.compare(str(obj.objectName), 'QtCreator.Menu.File', + "Creator was running in %s translation" % languageName) + activateItem(fileMenu) + except: + test.fail("Creator seems to be missing %s translation" % languageName) nativeType("<Command+q>") else: invokeMenuItem(testData.field(lang, "File"), testData.field(lang, "Exit")) - test.passes("Creator was running in %s translation." % languageName) + test.passes("Creator was running in %s translation." % languageName) except: test.fail("Creator seems to be missing %s translation" % languageName) sendEvent("QCloseEvent", ":Qt Creator_Core::Internal::MainWindow") |