[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[dpranke at chromium.org]

The following commit has been merged in the debian/experimental branch:
commit cfa148a4aff546e44c518cb570fc7491fe0b0481
Author: dpranke at chromium.org <dpranke at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Nov 20 01:48:12 2010 +0000

    2010-11-19  Dirk Pranke  <dpranke at chromium.org>
    
            Reviewed by Ojan Vafai.
    
            Do some minor cleanup and bug fixing.
    
            https://bugs.webkit.org/show_bug.cgi?id=49777
    
            * Scripts/webkitpy/layout_tests/layout_package/dump_render_tree_thread.py:
            * Scripts/webkitpy/layout_tests/run_webkit_tests_unittest.py:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@72457 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 853ee0a..3e10a2c 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -2,6 +2,17 @@
 
         Reviewed by Ojan Vafai.
 
+        Do some minor cleanup and bug fixing.
+
+        https://bugs.webkit.org/show_bug.cgi?id=49777
+
+        * Scripts/webkitpy/layout_tests/layout_package/dump_render_tree_thread.py:
+        * Scripts/webkitpy/layout_tests/run_webkit_tests_unittest.py:
+
+2010-11-19  Dirk Pranke  <dpranke at chromium.org>
+
+        Reviewed by Ojan Vafai.
+
         nrwt - config.build_directory() is busted
 
         Fixes a typo that was causing us to usually return the top level
diff --git a/WebKitTools/Scripts/webkitpy/layout_tests/layout_package/dump_render_tree_thread.py b/WebKitTools/Scripts/webkitpy/layout_tests/layout_package/dump_render_tree_thread.py
index de97ad4..48dfb16 100644
--- a/WebKitTools/Scripts/webkitpy/layout_tests/layout_package/dump_render_tree_thread.py
+++ b/WebKitTools/Scripts/webkitpy/layout_tests/layout_package/dump_render_tree_thread.py
@@ -399,9 +399,9 @@ class TestShellThread(WatchableThread):
             batch_count += 1
             self._num_tests += 1
             if self._options.run_singly:
-                result = self._run_test_singly(test_input)
+                result = self._run_test_in_another_thread(test_input)
             else:
-                result = self._run_test(test_input)
+                result = self._run_test_in_this_thread(test_input)
 
             filename = test_input.filename
             tests_run_file.write(filename + "\n")
@@ -431,7 +431,7 @@ class TestShellThread(WatchableThread):
             if test_runner:
                 test_runner.update_summary(result_summary)
 
-    def _run_test_singly(self, test_input):
+    def _run_test_in_another_thread(self, test_input):
         """Run a test in a separate thread, enforcing a hard time limit.
 
         Since we can only detect the termination of a thread, not any internal
@@ -443,7 +443,6 @@ class TestShellThread(WatchableThread):
 
         Returns:
           A TestResult
-
         """
         worker = SingleTestThread(self._port,
                                   self._options,
@@ -478,11 +477,11 @@ class TestShellThread(WatchableThread):
             _log.error('Cannot get results of test: %s' %
                        test_input.filename)
             result = test_results.TestResult(test_input.filename, failures=[],
-                test_run_time=0, total_time_for_all_diffs=0, time_for_diffs=0)
+                test_run_time=0, total_time_for_all_diffs=0, time_for_diffs={})
 
         return result
 
-    def _run_test(self, test_input):
+    def _run_test_in_this_thread(self, test_input):
         """Run a single test file using a shared DumpRenderTree process.
 
         Args:
diff --git a/WebKitTools/Scripts/webkitpy/layout_tests/run_webkit_tests_unittest.py b/WebKitTools/Scripts/webkitpy/layout_tests/run_webkit_tests_unittest.py
index 0bd1b3a..3dfc3e6 100644
--- a/WebKitTools/Scripts/webkitpy/layout_tests/run_webkit_tests_unittest.py
+++ b/WebKitTools/Scripts/webkitpy/layout_tests/run_webkit_tests_unittest.py
@@ -77,7 +77,7 @@ def passing_run(extra_args=None, port_obj=None, record_results=False,
         # We use the glob to test that globbing works.
         args.extend(['passes',
                      'http/tests',
-                     'http/tests/websocket/tests',
+                     'websocket/tests',
                      'failures/expected/*'])
     options, parsed_args = run_webkit_tests.parse_args(args)
     if not port_obj:
@@ -96,7 +96,7 @@ def logging_run(extra_args=None, port_obj=None, tests_included=False):
     if not tests_included:
         args.extend(['passes',
                      'http/tests',
-                     'http/tests/websocket/tests',
+                     'websocket/tests',
                      'failures/expected/*'])
     options, parsed_args = run_webkit_tests.parse_args(args)
     user = MockUser()

-- 
WebKit Debian packaging