Changeset 89944 in webkit

Timestamp:

Jun 28, 2011 11:29:17 AM (13 years ago)

Author:

rolandsteiner@chromium.org

Message:

2011-06-28 Roland Steiner <​rolandsteiner@chromium.org>

Reviewed by Tony Chang.

Fix filesystem_unittest.FileSystemTest test_read_and_write_file()
​https://bugs.webkit.org/show_bug.cgi?id=63514

• change write_text_file to write_binary_file
• check that text_path and binary_path are actually existant files
• change cleanup block from 'except' to 'finally'

• Scripts/webkitpy/common/system/filesystem_unittest.py:

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/common/system/filesystem_unittest.py (modified) (1 diff)

trunk/Tools/ChangeLog

@@ +1 @@
+2011-06-28  Roland Steiner  <rolandsteiner@chromium.org>
+
+        Reviewed by Tony Chang.
+
+        Fix filesystem_unittest.FileSystemTest test_read_and_write_file()
+        https://bugs.webkit.org/show_bug.cgi?id=63514
+
+        - change write_text_file to write_binary_file
+        - check that text_path and binary_path are actually existant files
+        - change cleanup block from 'except' to 'finally'
+
+        * Scripts/webkitpy/common/system/filesystem_unittest.py:
+
 2011-06-28  Adam Roben  <aroben@apple.com>
 

trunk/Tools/Scripts/webkitpy/common/system/filesystem_unittest.py

@@ -157 +157 @@
             self.assertEqual(contents, hex_equivalent)
 
-            fs.write_text_file(binary_path, hex_equivalent)
+            fs.write_binary_file(binary_path, hex_equivalent)
             text_contents = fs.read_text_file(binary_path)
             self.assertEqual(text_contents, unicode_text_string)
-        except:
-            if text_path:
+        finally:
+            if text_path and fs.isfile(text_path):
                 os.remove(text_path)
-            if binary_path:
+            if binary_path and fs.isfile(binary_path):
                 os.remove(binary_path)