2010-11-17 Hayato Ito <hayato@chromium.org>
authorhayato@chromium.org <hayato@chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 18 Nov 2010 02:02:37 +0000 (02:02 +0000)
committerhayato@chromium.org <hayato@chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 18 Nov 2010 02:02:37 +0000 (02:02 +0000)
        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: https://svn.webkit.org/repository/webkit/trunk@72267 268f45cc-cd09-0410-ab3c-d52691b4dbfc

WebKitTools/ChangeLog
WebKitTools/Scripts/webkitpy/layout_tests/layout_package/dump_render_tree_thread.py
WebKitTools/Scripts/webkitpy/layout_tests/run_webkit_tests.py

index 65d3591a4a5b40d89309ae7b95eada6f16331cdc..b67f9c658da511a16ccb7422029eb0c4c6dfbf9e 100644 (file)
@@ -1,3 +1,14 @@
+2010-11-17  Hayato Ito  <hayato@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@apple.com>
 
         Move FindSafari's settings into a vsprops file
index 81428672b605187e22111744c04490d5595ea3ef..88f493d0f98adb3411539df9209042e44b55393c 100644 (file)
@@ -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
index b37fa1ebf2bb3211d52294b5d8815efb954e36ef..119de8cfefe998e1305a8c1c7968a7163cbb5542 100755 (executable)
@@ -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.