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

[hayato at chromium.org]

The following commit has been merged in the debian/experimental branch:
commit f93d44711a28cff163332ea0261554258652e498
Author: hayato at chromium.org <hayato at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Nov 18 02:02:37 2010 +0000

    2010-11-17  Hayato Ito  <hayato at chromium.org>
    
            Reviewed by Shinichiro Hamaji.
    
            Remove a uri member from TestInput class.
    
            https://bugs.webkit.org/show_bug.cgi?id=49691
    
            * 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@72267 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 65d3591..b67f9c6 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,14 @@
+2010-11-17  Hayato Ito  <hayato at chromium.org>
+
+        Reviewed by Shinichiro Hamaji.
+
+        Remove a uri member from TestInput class.
+
+        https://bugs.webkit.org/show_bug.cgi?id=49691
+
+        * Scripts/webkitpy/layout_tests/layout_package/dump_render_tree_thread.py:
+        * Scripts/webkitpy/layout_tests/run_webkit_tests.py:
+
 2010-11-17  Adam Roben  <aroben at apple.com>
 
         Move FindSafari's settings into a vsprops file
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 8142867..88f493d 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
@@ -90,7 +90,7 @@ def _process_output(port, options, test_input, test_types, test_args,
       port: port-specific hooks
       options: command line options argument from optparse
       proc: an active DumpRenderTree process
-      test_input: Object containing the test filename, uri and timeout
+      test_input: Object containing the test filename and timeout
       test_types: list of test types to subject the output to
       test_args: arguments to be passed to each test
       test_output: a TestOutput object containing the output of the test
@@ -172,8 +172,8 @@ def _run_single_test(port, options, test_input, test_types, test_args, driver):
         image_hash_to_driver = port.expected_checksum(test_input.filename)
     else:
         image_hash_to_driver = None
-    test_input.uri = port.filename_to_uri(test_input.filename).strip()
-    test_output = driver.run_test(test_input.uri, test_input.timeout, image_hash_to_driver)
+    uri = port.filename_to_uri(test_input.filename)
+    test_output = driver.run_test(uri, test_input.timeout, image_hash_to_driver)
     return _process_output(port, options, test_input, test_types, test_args,
                            test_output)
 
@@ -186,7 +186,7 @@ class SingleTestThread(threading.Thread):
         Args:
           port: object implementing port-specific hooks
           options: command line argument object from optparse
-          test_input: Object containing the test filename, uri and timeout
+          test_input: Object containing the test filename and timeout
           test_types: A list of TestType objects to run the test output
               against.
           test_args: A TestArguments object to pass to each TestType.
@@ -457,7 +457,7 @@ class TestShellThread(WatchableThread):
         files singly.
 
         Args:
-          test_input: Object containing the test filename, uri and timeout
+          test_input: Object containing the test filename and timeout
 
         Returns:
           A TestResult
diff --git a/WebKitTools/Scripts/webkitpy/layout_tests/run_webkit_tests.py b/WebKitTools/Scripts/webkitpy/layout_tests/run_webkit_tests.py
index b37fa1e..119de8c 100755
--- a/WebKitTools/Scripts/webkitpy/layout_tests/run_webkit_tests.py
+++ b/WebKitTools/Scripts/webkitpy/layout_tests/run_webkit_tests.py
@@ -103,9 +103,6 @@ class TestInput:
         self.filename = filename
         self.timeout = timeout
 
-        # FIXME: Maybe the URI shouldn't be part of the TestInput at all?
-        self.uri = None
-
 
 class ResultSummary(object):
     """A class for partitioning the test results we get into buckets.

-- 
WebKit Debian packaging