diff options
author | Christian Stenger <christian.stenger@qt.io> | 2022-04-07 10:41:06 +0200 |
---|---|---|
committer | Christian Stenger <christian.stenger@qt.io> | 2022-04-13 04:29:19 +0000 |
commit | 0c1b5065c88a49dceca5cc14a8a92eb6c5b9a4bb (patch) | |
tree | a297551244f326274be07625c9efa9b70931a3a7 | |
parent | e4463ba6d43c1f86cf58af7cb5bfbb311fe5a297 (diff) | |
download | qt-creator-0c1b5065c88a49dceca5cc14a8a92eb6c5b9a4bb.tar.gz |
Squish: Remove obsolete workaround
Squish forces file dialogs to be real QFileDialogs for a long
time while testing.
Beside being no more necessary the workaround also causes
problems nowadays.
Change-Id: I211b64e61a0e28ede2a38d4d90cea5da350fa749
Reviewed-by: Robert Löhning <robert.loehning@qt.io>
-rw-r--r-- | tests/system/shared/utils.py | 50 |
1 files changed, 19 insertions, 31 deletions
diff --git a/tests/system/shared/utils.py b/tests/system/shared/utils.py index 1135351829..33c24a7c5c 100644 --- a/tests/system/shared/utils.py +++ b/tests/system/shared/utils.py @@ -238,41 +238,29 @@ def selectFromFileDialog(fileName, waitForFile=False, ignoreFinalSnooze=False): test.log("Closing active popup widget") QApplication.activePopupWidget().close() - if platform.system() == "Darwin": + fName = os.path.basename(os.path.abspath(fileName)) + pName = os.path.dirname(os.path.abspath(fileName)) + os.sep + try: + waitForObject("{name='QFileDialog' type='QFileDialog' visible='1'}", 5000) + pathLine = waitForObject("{name='fileNameEdit' type='QLineEdit' visible='1'}") + replaceEditorContent(pathLine, pName) snooze(1) - nativeType("<Command+Shift+g>") + clickButton(waitForObject("{text='Open' type='QPushButton'}")) + waitFor("str(pathLine.text)==''") + replaceEditorContent(pathLine, fName) snooze(1) - nativeType(fileName) - snooze(2) - nativeType("<Return>") - snooze(3) + __closePopupIfNecessary__() + clickButton(waitForObject("{text='Open' type='QPushButton'}")) + except: + nativeType("<Ctrl+a>") + nativeType("<Delete>") + nativeType(pName + fName) + seconds = len(pName + fName) / 20 + test.log("Using snooze(%d) [problems with event processing of nativeType()]" % seconds) + snooze(seconds) nativeType("<Return>") if not ignoreFinalSnooze: - snooze(1) - else: - fName = os.path.basename(os.path.abspath(fileName)) - pName = os.path.dirname(os.path.abspath(fileName)) + os.sep - try: - waitForObject("{name='QFileDialog' type='QFileDialog' visible='1'}", 5000) - pathLine = waitForObject("{name='fileNameEdit' type='QLineEdit' visible='1'}") - replaceEditorContent(pathLine, pName) - snooze(1) - clickButton(waitForObject("{text='Open' type='QPushButton'}")) - waitFor("str(pathLine.text)==''") - replaceEditorContent(pathLine, fName) - snooze(1) - __closePopupIfNecessary__() - clickButton(waitForObject("{text='Open' type='QPushButton'}")) - except: - nativeType("<Ctrl+a>") - nativeType("<Delete>") - nativeType(pName + fName) - seconds = len(pName + fName) / 20 - test.log("Using snooze(%d) [problems with event processing of nativeType()]" % seconds) - snooze(seconds) - nativeType("<Return>") - if not ignoreFinalSnooze: - snooze(3) + snooze(3) if waitForFile: fileCombo = waitForObject(":Qt Creator_FilenameQComboBox") if not waitFor("str(fileCombo.currentText) in fileName", 5000): |