From 3b9f1659ebf696275cbbfc9fd6303c230c263524 Mon Sep 17 00:00:00 2001
From: Robert Loehning <robert.loehning@theqtcompany.com>
Date: Mon, 29 Feb 2016 18:12:30 +0100
Subject: [PATCH] Squish: Update type of VCS log
Change-Id: Ia7359be2061a752a3e6957405b0150cd604b3bc7
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
---
tests/system/shared/utils.py | 4 ++--
tests/system/suite_tools/tst_git_clone/test.py | 2 +-
tests/system/suite_tools/tst_git_local/test.py | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/tests/system/shared/utils.py b/tests/system/shared/utils.py
index 016891a7320..97f1d7c5d42 100644
--- a/tests/system/shared/utils.py
+++ b/tests/system/shared/utils.py
@@ -615,9 +615,9 @@ def verifyItemOrder(items, text):
def openVcsLog():
try:
- foundObj = waitForObject("{type='QPlainTextEdit' unnamed='1' visible='1' "
+ foundObj = waitForObject("{type='Core::OutputWindow' unnamed='1' visible='1' "
"window=':Qt Creator_Core::Internal::MainWindow'}", 2000)
- if className(foundObj) != 'QPlainTextEdit':
+ if className(foundObj) != 'Core::OutputWindow':
raise Exception("Found derived class, but not a pure QPlainTextEdit.")
except:
invokeMenuItem("Window", "Output Panes", "Version Control")
diff --git a/tests/system/suite_tools/tst_git_clone/test.py b/tests/system/suite_tools/tst_git_clone/test.py
index 2ff16875774..bb941c473f0 100644
--- a/tests/system/suite_tools/tst_git_clone/test.py
+++ b/tests/system/suite_tools/tst_git_clone/test.py
@@ -63,7 +63,7 @@ def verifyCloneLog(targetDir, canceled):
def verifyVersionControlView(targetDir, canceled):
openVcsLog()
- vcsLog = str(waitForObject("{type='QPlainTextEdit' unnamed='1' visible='1' "
+ vcsLog = str(waitForObject("{type='Core::OutputWindow' unnamed='1' visible='1' "
"window=':Qt Creator_Core::Internal::MainWindow'}").plainText)
test.log("Clone log is: %s" % vcsLog)
test.verify("Executing in " + targetDir + ":" in vcsLog,
diff --git a/tests/system/suite_tools/tst_git_local/test.py b/tests/system/suite_tools/tst_git_local/test.py
index b969c4c86d1..affd6bbc64f 100644
--- a/tests/system/suite_tools/tst_git_local/test.py
+++ b/tests/system/suite_tools/tst_git_local/test.py
@@ -166,7 +166,7 @@ def main():
return
createProject_Qt_GUI(srcPath, projectName, addToVersionControl = "Git")
openVcsLog()
- vcsLog = waitForObject("{type='QPlainTextEdit' unnamed='1' visible='1' "
+ vcsLog = waitForObject("{type='Core::OutputWindow' unnamed='1' visible='1' "
"window=':Qt Creator_Core::Internal::MainWindow'}").plainText
test.verify("Initialized empty Git repository in %s"
% os.path.join(srcPath, projectName, ".git").replace("\\", "/") in str(vcsLog),
--
GitLab