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

Squish: Fix tst_rename_file on Mac

Browse Source 
Change-Id: Idca881989a673d3f220379d3a233c851ee75e248
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
This commit is contained in:
Christian Stenger
2014-01-16 15:33:02 +01:00
parent f710048c92
commit 4b6d04d63b
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tests/system/suite_general/tst_rename_file/test.py
View File

@@ -87,9 +87,6 @@ def renameFile(projectDir, proFile, branch, oldname, newname):
type(waitForObject(":Qt Creator_Utils::NavigationTreeView::QExpandingLineEdit"), "<Return>")
test.verify(waitFor("os.path.exists(newFilePath)", 1000),
"Verify that file with new name exists: %s" % newFilePath)
if not (oldname.lower() == newname.lower() and platform.system() in ('Windows', 'Microsoft')):
test.verify(not os.path.exists(oldFilePath),
"Verify that file with old name does not exist: %s" % oldFilePath)
test.compare(readFile(newFilePath), oldFileText,
"Comparing content of file before and after renaming")
test.verify(waitFor("newname in safeReadFile(proFile)", 2000),
@@ -97,6 +94,9 @@ def renameFile(projectDir, proFile, branch, oldname, newname):
if not oldname in newname:
test.verify(not oldname in readFile(proFile),
"Verify that old filename '%s' was removed from pro-file." % oldname)
if not (oldname.lower() == newname.lower() and platform.system() in ('Windows', 'Microsoft')):
test.verify(not oldname in os.listdir(projectDir),
"Verify that file with old name does not exist: %s" % oldFilePath)
def safeReadFile(filename):
text = ""