From 54a7188c277b955085902fb0b7792fe0635f8271 Mon Sep 17 00:00:00 2001 From: Robert Loehning Date: Thu, 6 Oct 2016 18:25:17 +0200 Subject: [PATCH] Squish: Cloning installer-framework instead of jom in tst_git_clone 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 --- tests/system/suite_tools/tst_git_clone/test.py | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/tests/system/suite_tools/tst_git_clone/test.py b/tests/system/suite_tools/tst_git_clone/test.py index 21ce9ba6bbb..5798ce56f45 100644 --- a/tests/system/suite_tools/tst_git_clone/test.py +++ b/tests/system/suite_tools/tst_git_clone/test.py @@ -25,8 +25,8 @@ source("../../shared/qtcreator.py") -cloneUrl = "https://codereview.qt-project.org/p/qt-labs/jom" -cloneDir = "myCloneOfJom" +cloneUrl = "https://code.qt.io/installer-framework/installer-framework.git" +cloneDir = "myCloneOfIfw" def verifyCloneLog(targetDir, canceled): if canceled: @@ -39,8 +39,7 @@ def verifyCloneLog(targetDir, canceled): test.warning("Cloning failed outside Creator.") return False # test for QTCREATORBUG-10112 - test.compare(cloneLog.count("remote: Counting objects:"), 1) - test.compare(cloneLog.count("remote: Finding sources:"), 1) + test.compare(cloneLog.count("remote: Total"), 1) test.compare(cloneLog.count("Receiving objects:"), 1) test.compare(cloneLog.count("Resolving deltas:"), 1) test.verify(not "Stopping..." in cloneLog, @@ -75,9 +74,9 @@ def verifyVersionControlView(targetDir, canceled): clickButton(waitForObject(":*Qt Creator.Clear_QToolButton")) def verifyFiles(targetDir): - for file in [".gitignore", "CMakeLists.txt", "jom.pro", - os.path.join("bin", "ibjom.bat"), - os.path.join("src", "app", "main.cpp")]: + for file in [".gitignore", "LGPL_EXCEPTION.txt", "installerfw.pro", + os.path.join("tests", "test-installer", "create-test-installer.bat"), + os.path.join("src", "sdk", "main.cpp")]: test.verify(os.path.exists(os.path.join(targetDir, cloneDir, file)), "Verify the existence of %s" % file) @@ -95,7 +94,7 @@ def main(): replaceEditorContent(waitForObject(":Working Copy_Utils::BaseValidatingLineEdit"), targetDir) cloneDirEdit = waitForObject("{name='Dir' type='QLineEdit' visible='1'}") - test.compare(cloneDirEdit.text, "jom") + test.compare(cloneDirEdit.text, "installer-framework") replaceEditorContent(cloneDirEdit, cloneDir) clickButton(waitForObject(":Next_QPushButton")) cloneLog = waitForObject(":Git Repository Clone.logPlainTextEdit_QPlainTextEdit", 1000)