diff options
| author | Christian Stenger <christian.stenger@digia.com> | 2014-01-16 15:33:02 +0100 |
|---|---|---|
| committer | Christian Stenger <christian.stenger@digia.com> | 2014-01-17 16:37:51 +0100 |
| commit | 4b6d04d63b0f8941d81f5e7a46c8baf669c33e32 (patch) | |
| tree | 04771aad48c5a6a3295ec727b70a91b6745c854f /tests | |
| parent | f710048c92c94698c7b6cac4be171020b94ee6ed (diff) | |
| download | qt-creator-4b6d04d63b0f8941d81f5e7a46c8baf669c33e32.tar.gz | |
Squish: Fix tst_rename_file on Mac
Change-Id: Idca881989a673d3f220379d3a233c851ee75e248
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/system/suite_general/tst_rename_file/test.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/system/suite_general/tst_rename_file/test.py b/tests/system/suite_general/tst_rename_file/test.py index b113fe8f55..a8cc687d0f 100644 --- a/tests/system/suite_general/tst_rename_file/test.py +++ b/tests/system/suite_general/tst_rename_file/test.py @@ -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 = "" |