OSDN Git Service

Squish: Button was renamed to "Issues"
authorRobert Loehning <robert.loehning@nokia.com>
Thu, 6 Oct 2011 11:55:05 +0000 (13:55 +0200)
committerRobert Löhning <robert.loehning@nokia.com>
Thu, 6 Oct 2011 12:13:50 +0000 (14:13 +0200)
(cherry picked from commit 2e968aa9989066f57e76e737164df67257d91bf1)

Change-Id: Ib0ce148edc46a663622d9437da3b7b977baad716
Reviewed-on: http://codereview.qt-project.org/6153
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
tests/system/shared/build_utils.py

index a778b51..0f99082 100644 (file)
@@ -44,7 +44,7 @@ def getInstalledSignalHandlers(name, signalSignature):
     return installedSignalHandlers.get("%s____%s" % (name,signalSignature))
 
 # this method checks the last build (if there's one) and logs the number of errors, warnings and
-# lines within the Build Issues output
+# lines within the Issues output
 # optional parameter can be used to tell this function if the build was expected to fail or not
 def checkLastBuild(expectedToFail=False):
     try:
@@ -70,14 +70,14 @@ def checkLastBuild(expectedToFail=False):
     else:
         test.fail("Errors: %s | Warnings: %s" % (errors, warnings))
     # additional stuff - could be removed... or improved :)
-    toggleBuildIssues = waitForObject("{type='Core::Internal::OutputPaneToggleButton' unnamed='1' "
+    toggleIssues = waitForObject("{type='Core::Internal::OutputPaneToggleButton' unnamed='1' "
                                       "visible='1' window=':Qt Creator_Core::Internal::MainWindow'}", 20000)
-    if not toggleBuildIssues.checked:
-        clickButton(toggleBuildIssues)
+    if not toggleIssues.checked:
+        clickButton(toggleIssues)
     list=waitForObject("{type='QListView' unnamed='1' visible='1' "
-                       "window=':Qt Creator_Core::Internal::MainWindow' windowTitle='Build Issues'}", 20000)
+                       "window=':Qt Creator_Core::Internal::MainWindow' windowTitle='Issues'}", 20000)
     model = list.model()
-    test.log("Rows inside build-issues: %d" % model.rowCount())
+    test.log("Rows inside issues: %d" % model.rowCount())
     if gotErrors and createTasksFileOnError:
         createTasksFile(list)
     return not gotErrors
@@ -96,7 +96,7 @@ def checkCompile():
     else:
         test.fatal("Compile Output:\n%s" % output.plainText)
 
-# helper method that parses the Build Issues output and writes a tasks file
+# helper method that parses the Issues output and writes a tasks file
 def createTasksFile(list):
     global tasksFileDir, tasksFileCount
     model = list.model()