Context Navigation

Changeset 73228 in webkit

Timestamp:

Dec 2, 2010 6:29:13 PM (13 years ago)

Author:

hayato@chromium.org

Message:

2010-12-02 Hayato Ito <hayato@chromium.org>

Reviewed by Eric Seidel.

Refactor test_types's compare_output() method so that it takes a
TestInput object.

compare_output() will need additional information included in a TestInput
object to support reftests. This change is a pre-requirement of that.

https://bugs.webkit.org/show_bug.cgi?id=50362

Location:

trunk/WebKitTools

Files:

-                      r73226
+                      r73228
+-12-02  Hayato Ito  <hayato@chromium.org>
+        Reviewed by Eric Seidel.
+        Refactor test_types's compare_output() method so that it takes a
+        TestInput object.
+        compare_output() will need additional information included in a TestInput
+        object to support reftests. This change is a pre-requirement of that.
+        https://bugs.webkit.org/show_bug.cgi?id=50362
+        * Scripts/webkitpy/layout_tests/layout_package/dump_render_tree_thread.py:
+        * Scripts/webkitpy/layout_tests/test_types/image_diff.py:
+        * Scripts/webkitpy/layout_tests/test_types/test_type_base.py:
+        * Scripts/webkitpy/layout_tests/test_types/test_type_base_unittest.py:
+        * Scripts/webkitpy/layout_tests/test_types/text_diff.py:
 -12-02  Simon Fraser  <simon.fraser@apple.com>

-                      r73222
+                      r73228
                 test_input.filename)
         test_output = driver.run_test(test_input)
         return self._process_output(test_input.filename, test_output)
     def _process_output(self, test_filename, test_output):
+        return self._process_output(test_input, test_output)
+    def _process_output(self, test_input, test_output):
         """Receives the output from a DumpRenderTree process, subjects it to a
         number of tests, and returns a list of failure types the test produced.
         Args:
         test_filename: full path to the test in question.
+        test_input: a TestInput object
         test_output: a TestOutput object containing the output of the test
 …
         """
         failures = []
+        test_filename = test_input.filename
         if test_output.crash:
 …
             start_diff_time = time.time()
             new_failures = test_type.compare_output(self._port,
                                                     test_filename,
+                                                    test_input,
                                                     self._test_args,
                                                     test_output,

-                      r72314
+                      r73228
         return port.diff_image(actual_image, expected_image, diff_filename)
     def compare_output(self, port, filename, test_args, actual_test_output,
+    def compare_output(self, port, test_input, test_args, actual_test_output,
                        expected_test_output):
         """Implementation of CompareOutput that checks the output image and
 …
         """
         failures = []
+        filename = test_input.filename
         # If we didn't produce a hash file, this test must be text-only.

-                      r72249
+                      r73228
         return os.path.splitext(output_filename)[0] + modifier
     def compare_output(self, port, filename, test_args, actual_test_output,
+    def compare_output(self, port, test_input, test_args, actual_test_output,
                         expected_test_output):
         """Method that compares the output from the test with the
 …
         Args:
           port: object implementing port-specific information and methods
           filename: absolute filename to test file
+          test_input: a TestInput object
           test_args: a TestArguments object holding optional additional
               arguments

-                      r65953
+                      r73228
         test_type = test_type_base.TestTypeBase(None, None)
         self.assertRaises(NotImplementedError, test_type.compare_output,
+                          None, "foo.txt", '',
+                          test_type_base.TestArguments(), 'Debug')
+                          None, None, test_type_base.TestArguments(), None, None)

-                      r72307
+                      r73228
         return norm + "\n"
     def compare_output(self, port, filename, test_args, actual_test_output,
+    def compare_output(self, port, test_input, test_args, actual_test_output,
                         expected_test_output):
         """Implementation of CompareOutput that checks the output text against
 …
             # we do not ever decode it inside run-webkit-tests.  For some tests
             # DumpRenderTree may not output utf-8 text (e.g. webarchives).
             self._save_baseline_data(filename, actual_test_output.text,
+            self._save_baseline_data(test_input.filename, actual_test_output.text,
                                      ".txt", encoding=None,
                                      generate_new_baseline=test_args.new_baseline)
 …
         if port.compare_text(actual_text, expected_text):
             # Text doesn't match, write output files.
             self.write_output_files(filename, ".txt", actual_text,
+            self.write_output_files(test_input.filename, ".txt", actual_text,
                                     expected_text, encoding=None,
                                     print_text_diffs=True)

Note: See TracChangeset for help on using the changeset viewer.