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

Squish: Update tst_git_local

Browse Source 
Change-Id: If3b3eb69a7927d0ecbc5d10afee6ab3fdfbd448b
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
Robert Loehning
2019-06-26 17:42:41 +02:00
parent e777ad57c5
commit 0b5d60db53
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -146,9 +146,9 @@ def verifyClickCommit():
"Verifying whether diff editor contains pointless_header.h file.") "Verifying whether diff editor contains pointless_header.h file.")
test.verify(pointlessHeader not in diffOriginal, test.verify(pointlessHeader not in diffOriginal,
"Verifying whether original does not contain pointless_header.h file.") "Verifying whether original does not contain pointless_header.h file.")
test.verify("HEADERS += \\\n mainwindow.h \\\n pointless_header.h\n" in diffChanged, test.verify("HEADERS += \\\n mainwindow.h \\\n pointless_header.h\n" in diffChanged,
"Verifying whether diff editor has pointless_header.h listed in pro file.") "Verifying whether diff editor has pointless_header.h listed in pro file.")
test.verify("HEADERS += \\\n mainwindow.h\n\n" in diffOriginal test.verify("HEADERS += \\\n mainwindow.h\n\n" in diffOriginal
and "pointless_header.h" not in diffOriginal, and "pointless_header.h" not in diffOriginal,
"Verifying whether original has no additional header in pro file.") "Verifying whether original has no additional header in pro file.")
test.verify(original.readOnly and changed.readOnly, test.verify(original.readOnly and changed.readOnly,
@@ -173,7 +173,7 @@ def main():
% os.path.join(srcPath, projectName, ".git").replace("\\", "/") in str(vcsLog), % os.path.join(srcPath, projectName, ".git").replace("\\", "/") in str(vcsLog),
"Has initialization of repo been logged:\n%s " % vcsLog) "Has initialization of repo been logged:\n%s " % vcsLog)
createLocalGitConfig(os.path.join(srcPath, projectName, ".git")) createLocalGitConfig(os.path.join(srcPath, projectName, ".git"))
commitMessages = [commit("Initial Commit", "Committed 5 files.")] commitMessages = [commit("Initial Commit", "Committed 6 files.")]
clickButton(waitForObject(":*Qt Creator.Clear_QToolButton")) clickButton(waitForObject(":*Qt Creator.Clear_QToolButton"))
headerName = "pointless_header.h" headerName = "pointless_header.h"
addCPlusPlusFile(headerName, "C++ Header File", projectName + ".pro", addCPlusPlusFile(headerName, "C++ Header File", projectName + ".pro",