diff options
| author | Robert Loehning <robert.loehning@theqtcompany.com> | 2015-05-18 19:05:49 +0200 |
|---|---|---|
| committer | Robert Loehning <robert.loehning@theqtcompany.com> | 2015-06-16 16:15:23 +0000 |
| commit | 13daaaac675b3db91103536d24490056bbcd6741 (patch) | |
| tree | a774c92ed6735cfe552a1e3c1bff62bdd49b55a2 | |
| parent | 2b84d7611b6c5b9165c1ebda80af38afc9f59771 (diff) | |
| download | qt-creator-13daaaac675b3db91103536d24490056bbcd6741.tar.gz | |
Squish: Update tst_git_first_commit and tst_git_local
Change-Id: I5e7a1c3be4fe7fab848c98abdf52d3b9af318047
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
| -rw-r--r-- | tests/system/shared/project.py | 2 | ||||
| -rw-r--r-- | tests/system/suite_tools/tst_git_first_commit/test.py | 6 | ||||
| -rw-r--r-- | tests/system/suite_tools/tst_git_local/test.py | 2 |
3 files changed, 7 insertions, 3 deletions
diff --git a/tests/system/shared/project.py b/tests/system/shared/project.py index d3abc1cf6d..c38531afda 100644 --- a/tests/system/shared/project.py +++ b/tests/system/shared/project.py @@ -113,7 +113,7 @@ def __createProjectSetNameAndPath__(path, projectName = None, checks = True, lib "toolTip?='Full path: *'}") replaceEditorContent(directoryEdit, path) projectNameEdit = waitForObject("{name='nameLineEdit' visible='1' " - "type='Utils::ProjectNameValidatingLineEdit'}") + "type='Utils::FancyLineEdit'}") if projectName == None: projectName = projectNameEdit.text else: diff --git a/tests/system/suite_tools/tst_git_first_commit/test.py b/tests/system/suite_tools/tst_git_first_commit/test.py index 6fd874b830..bfd3a1d755 100644 --- a/tests/system/suite_tools/tst_git_first_commit/test.py +++ b/tests/system/suite_tools/tst_git_first_commit/test.py @@ -65,5 +65,9 @@ def main(): changedEdit = waitForObject(":Qt Creator_DiffEditor::SideDiffEditorWidget") waitFor("len(str(changedEdit.plainText)) > 0 and " "str(changedEdit.plainText) != 'Waiting for data...'", 20000) - test.xverify(str(changedEdit.plainText) != "No difference", "Does Creator show actual changes?") + diffPlainText = str(changedEdit.plainText) + test.verify("# This file is used to ignore files which are generated" in diffPlainText, + "Comment from .gitignore in diff?") + test.verify("SharedTools::QtSingleApplication app((QLatin1String(appNameC)), argc, argv);" + in diffPlainText, "main function in diff?") invokeMenuItem("File", "Exit") diff --git a/tests/system/suite_tools/tst_git_local/test.py b/tests/system/suite_tools/tst_git_local/test.py index ca0e73890d..121c286b82 100644 --- a/tests/system/suite_tools/tst_git_local/test.py +++ b/tests/system/suite_tools/tst_git_local/test.py @@ -57,7 +57,7 @@ def commit(commitMessage, expectedLogMessage, uncheckUntracked=False): def verifyItemsInGit(commitMessages): gitEditor = waitForObject(":Qt Creator_Git::Internal::GitEditor") - waitFor("len(str(gitEditor.plainText)) > 0 and str(gitEditor.plainText) != 'Waiting for data...'", 20000) + waitFor("len(str(gitEditor.plainText)) > 0 and str(gitEditor.plainText) != 'Working...'", 20000) plainText = str(gitEditor.plainText) verifyItemOrder(commitMessages, plainText) return plainText |