From dbf48009cc9ac78b99f9c0f01210f38f9ca41f77 Mon Sep 17 00:00:00 2001
From: Robert Loehning <robert.loehning@nokia.com>
Date: Mon, 10 Oct 2011 13:10:34 +0200
Subject: [PATCH] Squish: Don't add temporary files to git
Change-Id: Ia076166a867c1c1a9031ea6515143876f4a73d34
Reviewed-on: http://codereview.qt-project.org/6263
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
---
tests/system/objects.map | 1 +
tests/system/shared/project.py | 2 ++
tests/system/suite_qtquick/tst_qtquick_creation3/test.py | 1 +
tests/system/suite_qtquick/tst_qtquick_creation4/test.py | 1 +
4 files changed, 5 insertions(+)
diff --git a/tests/system/objects.map b/tests/system/objects.map
index 8001ac4392..523991e592 100644
--- a/tests/system/objects.map
+++ b/tests/system/objects.map
@@ -38,6 +38,7 @@
:Qt Gui Application_Qt4ProjectManager::Internal::GuiAppWizardDialog {type='Qt4ProjectManager::Internal::GuiAppWizardDialog' unnamed='1' visible='1' windowTitle='Qt Gui Application'}
:QtCreator.MenuBar_ProjectExplorer::Internal::MiniProjectTargetSelector {type='ProjectExplorer::Internal::MiniProjectTargetSelector'}
:QtCreator.MenuBar_ProjectExplorer::Internal::ProjectListWidget {type='ProjectExplorer::Internal::ProjectListWidget' window=':QtCreator.MenuBar_ProjectExplorer::Internal::MiniProjectTargetSelector'}
+:addToVersionControlComboBox_QComboBox {name='addToVersionControlComboBox' type='QComboBox' visible='1'}
:formFileLineEdit_Utils::FileNameValidatingLineEdit {buddy=':Qt Gui Application.Form file:_QLabel' name='formFileLineEdit' type='Utils::FileNameValidatingLineEdit' visible='1'}
:frame.nameLineEdit_Utils::ProjectNameValidatingLineEdit {container=':Qt Gui Application.frame_QFrame' name='nameLineEdit' type='Utils::ProjectNameValidatingLineEdit' visible='1'}
:frame_Utils::BaseValidatingLineEdit {container=':Qt Gui Application.frame_QFrame' type='Utils::BaseValidatingLineEdit' unnamed='1' visible='1'}
diff --git a/tests/system/shared/project.py b/tests/system/shared/project.py
index 21194ca859..ee7301b3e6 100644
--- a/tests/system/shared/project.py
+++ b/tests/system/shared/project.py
@@ -112,6 +112,7 @@ def createProject_Qt_GUI(path, projectName, qtVersion, checks):
test.verify(ui_found > cpp_found, "'" + ui_file + "' found at index " + str(ui_found))
test.verify(pro_found > ui_found, "'" + pro_file + "' found at index " + str(pro_found))
+ selectFromCombo(":addToVersionControlComboBox_QComboBox", "<None>")
clickButton(waitForObject(":Qt Gui Application.Finish_QPushButton"))
if checks:
@@ -159,4 +160,5 @@ def createNewQtQuickApplication(workingDir, projectName = None, templateFile = N
chooseDestination(destination)
snooze(1)
clickButton(nextButton)
+ selectFromCombo(":addToVersionControlComboBox_QComboBox", "<None>")
clickButton(waitForObject("{type='QPushButton' text~='(Finish|Done)' visible='1'}", 20000))
diff --git a/tests/system/suite_qtquick/tst_qtquick_creation3/test.py b/tests/system/suite_qtquick/tst_qtquick_creation3/test.py
index 37e976aca5..e7c191f74c 100644
--- a/tests/system/suite_qtquick/tst_qtquick_creation3/test.py
+++ b/tests/system/suite_qtquick/tst_qtquick_creation3/test.py
@@ -30,6 +30,7 @@ def createNewQtQuickUI():
clickButton(cbDefaultLocation)
# now there's the 'untitled' project inside a temporary directory - step forward...!
clickButton(waitForObject("{text~='(Next.*|Continue)' type='QPushButton' visible='1'}", 20000))
+ selectFromCombo(":addToVersionControlComboBox_QComboBox", "<None>")
clickButton(waitForObject("{type='QPushButton' text~='(Finish|Done)' visible='1'}", 20000))
def cleanup():
diff --git a/tests/system/suite_qtquick/tst_qtquick_creation4/test.py b/tests/system/suite_qtquick/tst_qtquick_creation4/test.py
index 0dfa6e6404..1861aa2558 100644
--- a/tests/system/suite_qtquick/tst_qtquick_creation4/test.py
+++ b/tests/system/suite_qtquick/tst_qtquick_creation4/test.py
@@ -45,6 +45,7 @@ def createNewQmlExtension():
"type='QLineEdit' unnamed='1' visible='1'}", 20000)
replaceEditorContent(uriLineEd, "com.nokia.test.qmlcomponents")
clickButton(nextButton)
+ selectFromCombo(":addToVersionControlComboBox_QComboBox", "<None>")
clickButton(waitForObject("{type='QPushButton' text~='(Finish|Done)' visible='1'}", 20000))
def cleanup():
--
GitLab