[SCM] WebKit Debian packaging branch, webkit-1.3, updated. upstream/1.3.7-4207-g178b198

[dpranke at chromium.org]

The following commit has been merged in the webkit-1.3 branch:
commit f9c0d2dc9da8120d78a9eb54c451f2bf880146be
Author: dpranke at chromium.org <dpranke at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Jan 20 03:55:02 2011 +0000

    2011-01-19  Dirk Pranke  <dpranke at chromium.org>
    
            Unreviewed, build fix.
    
            Fix a couple of minor bugs discovered while bringing up new bots
            for testing.
    
            * Scripts/webkitpy/layout_tests/layout_package/dump_render_tree_thread.py:
            * Scripts/webkitpy/layout_tests/run_webkit_tests.py:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@76199 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index 67fb18a..4ff749e 100644
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,13 @@
+2011-01-19  Dirk Pranke  <dpranke at chromium.org>
+
+        Unreviewed, build fix.
+
+        Fix a couple of minor bugs discovered while bringing up new bots
+        for testing.
+
+        * Scripts/webkitpy/layout_tests/layout_package/dump_render_tree_thread.py:
+        * Scripts/webkitpy/layout_tests/run_webkit_tests.py:
+
 2011-01-19  James Robinson  <jamesr at chromium.org>
 
         Unreviewed, rolling out r76194.
diff --git a/Tools/Scripts/webkitpy/common/system/filesystem.py b/Tools/Scripts/webkitpy/common/system/filesystem.py
index d75276e..05513a9 100644
--- a/Tools/Scripts/webkitpy/common/system/filesystem.py
+++ b/Tools/Scripts/webkitpy/common/system/filesystem.py
@@ -185,7 +185,7 @@ class FileSystem(object):
         """Returns a file handle suitable for writing to."""
         mode = 'w'
         if append:
-            mode = 'wa'
+            mode = 'a'
         return codecs.open(path, mode, 'utf8')
 
     def read_binary_file(self, path):
diff --git a/Tools/Scripts/webkitpy/layout_tests/layout_package/dump_render_tree_thread.py b/Tools/Scripts/webkitpy/layout_tests/layout_package/dump_render_tree_thread.py
index bd52e65..050eefa 100644
--- a/Tools/Scripts/webkitpy/layout_tests/layout_package/dump_render_tree_thread.py
+++ b/Tools/Scripts/webkitpy/layout_tests/layout_package/dump_render_tree_thread.py
@@ -384,8 +384,7 @@ class TestShellThread(WatchableThread):
         # This is created in run_webkit_tests.py:_PrepareListsAndPrintOutput.
         tests_run_filename = self._port._filesystem.join(self._options.results_directory,
                                           "tests_run.txt")
-        tests_run_file = self._port._filesystem.open_text_file_for_writing(tests_run_filename, append=True)
-
+        tests_run_file = self._port._filesystem.open_text_file_for_writing(tests_run_filename, append=False)
         while True:
             if self._canceled:
                 _log.debug('Testing cancelled')
diff --git a/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests.py b/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests.py
index dcdcfaa..c801fd1 100755
--- a/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests.py
+++ b/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests.py
@@ -80,7 +80,7 @@ def run(port, options, args, regular_output=sys.stderr,
         printer.cleanup()
         return 0
 
-    last_unexpected_results = _gather_unexpected_results(options)
+    last_unexpected_results = _gather_unexpected_results(port, options)
     if options.print_last_failures:
         printer.write("\n".join(last_unexpected_results) + "\n")
         printer.cleanup()
@@ -162,15 +162,16 @@ def _set_up_derived_options(port_obj, options):
     return warnings
 
 
-def _gather_unexpected_results(options):
+def _gather_unexpected_results(port, options):
     """Returns the unexpected results from the previous run, if any."""
     last_unexpected_results = []
     if options.print_last_failures or options.retest_last_failures:
         unexpected_results_filename = os.path.join(
         options.results_directory, "unexpected_results.json")
-        with codecs.open(unexpected_results_filename, "r", "utf-8") as file:
+        if port._filesystem.exists(unexpected_results_filename):
+            file = port._filesystem.read_text_file(unexpected_results.json)
             results = simplejson.load(file)
-        last_unexpected_results = results['tests'].keys()
+            last_unexpected_results = results['tests'].keys()
     return last_unexpected_results
 
 

-- 
WebKit Debian packaging