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

Squish: Cloning installer-framework instead of jom in tst_git_clone

Browse Source 
jom's repository can be cloned quicker than Squish can cancel the
procedure, making the test instable. Cloning installer-framework
takes a couple of seconds longer.

Change-Id: I032a4bf60cfd3b070e4c311fbd1dae5b81e8fcd1
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
Robert Loehning
2016-10-06 18:25:17 +02:00
parent 8579e684df
commit 54a7188c27
1 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
tests/system/suite_tools/tst_git_clone/test.py
View File

@@ -25,8 +25,8 @@
source("../../shared/qtcreator.py") source("../../shared/qtcreator.py")
cloneUrl = "https://codereview.qt-project.org/p/qt-labs/jom" cloneUrl = "https://code.qt.io/installer-framework/installer-framework.git"
cloneDir = "myCloneOfJom" cloneDir = "myCloneOfIfw"
def verifyCloneLog(targetDir, canceled): def verifyCloneLog(targetDir, canceled):
if canceled: if canceled:
@@ -39,8 +39,7 @@ def verifyCloneLog(targetDir, canceled):
test.warning("Cloning failed outside Creator.") test.warning("Cloning failed outside Creator.")
return False return False
# test for QTCREATORBUG-10112 # test for QTCREATORBUG-10112
test.compare(cloneLog.count("remote: Counting objects:"), 1) test.compare(cloneLog.count("remote: Total"), 1)
test.compare(cloneLog.count("remote: Finding sources:"), 1)
test.compare(cloneLog.count("Receiving objects:"), 1) test.compare(cloneLog.count("Receiving objects:"), 1)
test.compare(cloneLog.count("Resolving deltas:"), 1) test.compare(cloneLog.count("Resolving deltas:"), 1)
test.verify(not "Stopping..." in cloneLog, test.verify(not "Stopping..." in cloneLog,
@@ -75,9 +74,9 @@ def verifyVersionControlView(targetDir, canceled):
clickButton(waitForObject(":*Qt Creator.Clear_QToolButton")) clickButton(waitForObject(":*Qt Creator.Clear_QToolButton"))
def verifyFiles(targetDir): def verifyFiles(targetDir):
for file in [".gitignore", "CMakeLists.txt", "jom.pro", for file in [".gitignore", "LGPL_EXCEPTION.txt", "installerfw.pro",
os.path.join("bin", "ibjom.bat"), os.path.join("tests", "test-installer", "create-test-installer.bat"),
os.path.join("src", "app", "main.cpp")]: os.path.join("src", "sdk", "main.cpp")]:
test.verify(os.path.exists(os.path.join(targetDir, cloneDir, file)), test.verify(os.path.exists(os.path.join(targetDir, cloneDir, file)),
"Verify the existence of %s" % file) "Verify the existence of %s" % file)
@@ -95,7 +94,7 @@ def main():
replaceEditorContent(waitForObject(":Working Copy_Utils::BaseValidatingLineEdit"), replaceEditorContent(waitForObject(":Working Copy_Utils::BaseValidatingLineEdit"),
targetDir) targetDir)
cloneDirEdit = waitForObject("{name='Dir' type='QLineEdit' visible='1'}") cloneDirEdit = waitForObject("{name='Dir' type='QLineEdit' visible='1'}")
test.compare(cloneDirEdit.text, "jom") test.compare(cloneDirEdit.text, "installer-framework")
replaceEditorContent(cloneDirEdit, cloneDir) replaceEditorContent(cloneDirEdit, cloneDir)
clickButton(waitForObject(":Next_QPushButton")) clickButton(waitForObject(":Next_QPushButton"))
cloneLog = waitForObject(":Git Repository Clone.logPlainTextEdit_QPlainTextEdit", 1000) cloneLog = waitForObject(":Git Repository Clone.logPlainTextEdit_QPlainTextEdit", 1000)