feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Squish: Updates to keep suite_tools running

Browse Source 
Change-Id: Idb7a4c70c26aaf105ba2023d126fbc0f9f992e9e
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
This commit is contained in:
Robert Loehning
2014-09-17 19:15:49 +02:00
parent 98c3a1c331
commit 4c45e43916
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/system/objects.map
View File

@@ -159,7 +159,7 @@
:Qt Creator_DiffEditor::SideDiffEditorWidget2 {occurrence='2' type='DiffEditor::SideDiffEditorWidget' unnamed='1' visible='1' window=':Qt Creator_Core::Internal::MainWindow'} :Qt Creator_DiffEditor::SideDiffEditorWidget2 {occurrence='2' type='DiffEditor::SideDiffEditorWidget' unnamed='1' visible='1' window=':Qt Creator_Core::Internal::MainWindow'}
:Qt Creator_FilenameQComboBox {type='QComboBox' unnamed='1' visible='1' window=':Qt Creator_Core::Internal::MainWindow'} :Qt Creator_FilenameQComboBox {type='QComboBox' unnamed='1' visible='1' window=':Qt Creator_Core::Internal::MainWindow'}
:Qt Creator_Find::Internal::SearchResultTreeView {type='Core::Internal::SearchResultTreeView' unnamed='1' visible='1' window=':Qt Creator_Core::Internal::MainWindow'} :Qt Creator_Find::Internal::SearchResultTreeView {type='Core::Internal::SearchResultTreeView' unnamed='1' visible='1' window=':Qt Creator_Core::Internal::MainWindow'}
:Qt Creator_Git::Internal::GitEditor {type='Git::Internal::GitEditor' unnamed='1' visible='1' window=':Qt Creator_Core::Internal::MainWindow'} :Qt Creator_Git::Internal::GitEditor {type='Git::Internal::GitEditorWidget' unnamed='1' visible='1' window=':Qt Creator_Core::Internal::MainWindow'}
:Qt Creator_Help::Internal::HelpViewer {type='Help::Internal::QtWebKitHelpWidget' unnamed='1' visible='1' window=':Qt Creator_Core::Internal::MainWindow'} :Qt Creator_Help::Internal::HelpViewer {type='Help::Internal::QtWebKitHelpWidget' unnamed='1' visible='1' window=':Qt Creator_Core::Internal::MainWindow'}
:Qt Creator_HelpSelector_QComboBox {occurrence='3' type='QComboBox' unnamed='1' visible='1' window=':Qt Creator_Core::Internal::MainWindow'} :Qt Creator_HelpSelector_QComboBox {occurrence='3' type='QComboBox' unnamed='1' visible='1' window=':Qt Creator_Core::Internal::MainWindow'}
:Qt Creator_Issues_Core::Internal::OutputPaneToggleButton {occurrence='1' type='Core::Internal::OutputPaneToggleButton' unnamed='1' visible='1' window=':Qt Creator_Core::Internal::MainWindow'} :Qt Creator_Issues_Core::Internal::OutputPaneToggleButton {occurrence='1' type='Core::Internal::OutputPaneToggleButton' unnamed='1' visible='1' window=':Qt Creator_Core::Internal::MainWindow'}

2
tests/system/suite_tools/tst_external_sort/test.py
View File

@@ -40,7 +40,7 @@ def main():
locale = "LC_ALL=C " locale = "LC_ALL=C "
sorted = getOutputFromCmdline("%ssort %s" % (locale, unsortedFile)).replace("\r", "") sorted = getOutputFromCmdline("%ssort %s" % (locale, unsortedFile)).replace("\r", "")
selectFromFileDialog(unsortedFile) selectFromFileDialog(unsortedFile)
editor = waitForObject("{type='TextEditor::PlainTextEditorWidget' unnamed='1' " editor = waitForObject("{type='TextEditor::BaseTextEditorWidget' unnamed='1' "
"visible='1' window=':Qt Creator_Core::Internal::MainWindow'}", 3000) "visible='1' window=':Qt Creator_Core::Internal::MainWindow'}", 3000)
placeCursorToLine(editor, "bbb") placeCursorToLine(editor, "bbb")
invokeMenuItem("Edit", "Select All") invokeMenuItem("Edit", "Select All")

2
tests/system/suite_tools/tst_git_local/test.py
View File

@@ -152,7 +152,7 @@ def main():
clickButton(waitForObject(":Next_QPushButton")) clickButton(waitForObject(":Next_QPushButton"))
readmeName += ".txt" readmeName += ".txt"
__createProjectHandleLastPage__([readmeName], "Git", "<None>") __createProjectHandleLastPage__([readmeName], "Git", "<None>")
replaceEditorContent(waitForObject(":Qt Creator_TextEditor::PlainTextEditorWidget"), replaceEditorContent(waitForObject(":Qt Creator_TextEditor::BaseTextEditorWidget"),
"Some important advice in the README") "Some important advice in the README")
invokeMenuItem("File", "Save All") invokeMenuItem("File", "Save All")
commitsInProject = list(commitMessages) # deep copy commitsInProject = list(commitMessages) # deep copy