Changeset 107361 in webkit


Ignore:
Timestamp:
Feb 9, 2012 10:18:09 PM (12 years ago)
Author:
eric@webkit.org
Message:

Rename compare_text and compare_audio to make it clear that they're !=
https://bugs.webkit.org/show_bug.cgi?id=78301

Reviewed by Adam Barth.

I also removed the maybe_create_directory function which was redundant.

  • Scripts/webkitpy/layout_tests/controllers/manager.py:

(Manager.set_up_run):

  • Scripts/webkitpy/layout_tests/controllers/test_result_writer.py:

(TestResultWriter._make_output_directory):

  • Scripts/webkitpy/layout_tests/port/base.py:

(Port.do_text_results_differ):
(Port.do_audio_results_differ):
(Port.diff_text):
(Port.driver_name):
(Port.skips_perf_test):

  • Scripts/webkitpy/layout_tests/port/win.py:

(WinPort.do_text_results_differ):

  • Scripts/webkitpy/layout_tests/port/win_unittest.py:

(WinPortTest.test_do_text_results_differ):

  • Scripts/webkitpy/layout_tests/servers/apache_http_server.py:

(LayoutTestApacheHttpd.init):

  • Scripts/webkitpy/layout_tests/servers/http_server_base.py:

(HttpServerBase.init):

  • Scripts/webkitpy/to_be_moved/rebaseline_chromium_webkit_tests.py:

(Rebaseliner._diff_baselines):

Location:
trunk/Tools
Files:
10 edited

Legend:

Unmodified
Added
Removed
  • trunk/Tools/ChangeLog

    r107351 r107361  
     12012-02-09  Eric Seidel  <eric@webkit.org>
     2
     3        Rename compare_text and compare_audio to make it clear that they're !=
     4        https://bugs.webkit.org/show_bug.cgi?id=78301
     5
     6        Reviewed by Adam Barth.
     7
     8        I also removed the maybe_create_directory function which was redundant.
     9
     10        * Scripts/webkitpy/layout_tests/controllers/manager.py:
     11        (Manager.set_up_run):
     12        * Scripts/webkitpy/layout_tests/controllers/test_result_writer.py:
     13        (TestResultWriter._make_output_directory):
     14        * Scripts/webkitpy/layout_tests/port/base.py:
     15        (Port.do_text_results_differ):
     16        (Port.do_audio_results_differ):
     17        (Port.diff_text):
     18        (Port.driver_name):
     19        (Port.skips_perf_test):
     20        * Scripts/webkitpy/layout_tests/port/win.py:
     21        (WinPort.do_text_results_differ):
     22        * Scripts/webkitpy/layout_tests/port/win_unittest.py:
     23        (WinPortTest.test_do_text_results_differ):
     24        * Scripts/webkitpy/layout_tests/servers/apache_http_server.py:
     25        (LayoutTestApacheHttpd.__init__):
     26        * Scripts/webkitpy/layout_tests/servers/http_server_base.py:
     27        (HttpServerBase.__init__):
     28        * Scripts/webkitpy/to_be_moved/rebaseline_chromium_webkit_tests.py:
     29        (Rebaseliner._diff_baselines):
     30
    1312012-02-09  Zan Dobersek  <zandobersek@gmail.com>
    232
  • trunk/Tools/Scripts/webkitpy/layout_tests/controllers/manager.py

    r107136 r107361  
    868868
    869869        # Create the output directory if it doesn't already exist.
    870         self._port.maybe_make_directory(self._results_directory)
     870        self._port.host.filesystem.maybe_make_directory(self._results_directory)
    871871
    872872        self._port.setup_test_run()
  • trunk/Tools/Scripts/webkitpy/layout_tests/controllers/single_test_runner.py

    r107113 r107361  
    225225        if (expected_text and actual_text and
    226226            # Assuming expected_text is already normalized.
    227             self._port.compare_text(self._get_normalized_output_text(actual_text), expected_text)):
     227            self._port.do_text_results_differ(self._get_normalized_output_text(actual_text), expected_text)):
    228228            failures.append(test_failures.FailureTextMismatch())
    229229        elif actual_text and not expected_text:
     
    234234        failures = []
    235235        if (expected_audio and actual_audio and
    236             self._port.compare_audio(actual_audio, expected_audio)):
     236            self._port.do_audio_results_differ(actual_audio, expected_audio)):
    237237            failures.append(test_failures.FailureAudioMismatch())
    238238        elif actual_audio and not expected_audio:
  • trunk/Tools/Scripts/webkitpy/layout_tests/controllers/test_result_writer.py

    r107302 r107361  
    106106        fs = self._port._filesystem
    107107        output_filename = fs.join(self._root_output_dir, self._test_name)
    108         self._port.maybe_make_directory(fs.dirname(output_filename))
     108        fs.maybe_make_directory(fs.dirname(output_filename))
    109109
    110110    def output_filename(self, modifier):
  • trunk/Tools/Scripts/webkitpy/layout_tests/port/base.py

    r107151 r107361  
    249249            return False
    250250
    251     def compare_text(self, expected_text, actual_text):
    252         """Return whether or not the two strings are *not* equal. This
    253         routine is used to diff text output.
    254 
    255         While this is a generic routine, we include it in the Port
    256         interface so that it can be overriden for testing purposes."""
     251    def do_text_results_differ(self, expected_text, actual_text):
    257252        return expected_text != actual_text
    258253
    259     def compare_audio(self, expected_audio, actual_audio):
    260         # FIXME: If we give this method a better name it won't need this docstring (e.g. are_audio_results_equal()).
    261         """Return whether the two audio files are *not* equal."""
     254    def do_audio_results_differ(self, expected_audio, actual_audio):
    262255        return expected_audio != actual_audio
    263256
     
    270263        raise NotImplementedError('Port.diff_image')
    271264
    272 
    273     def diff_text(self, expected_text, actual_text,
    274                   expected_filename, actual_filename):
     265    def diff_text(self, expected_text, actual_text, expected_filename, actual_filename):
    275266        """Returns a string containing the diff of the two text strings
    276         in 'unified diff' format.
    277 
    278         While this is a generic routine, we include it in the Port
    279         interface so that it can be overriden for testing purposes."""
     267        in 'unified diff' format."""
    280268
    281269        # The filenames show up in the diff output, make sure they're
     
    310298
    311299    def driver_name(self):
    312         """Returns the name of the actual binary that is performing the test,
    313         so that it can be referred to in log messages. In most cases this
    314         will be DumpRenderTree, but if a port uses a binary with a different
    315         name, it can be overridden here."""
     300        # FIXME: Seems we should get this from the Port's Driver class.
    316301        return "DumpRenderTree"
    317302
     
    619604                return True
    620605        return False
    621 
    622     def maybe_make_directory(self, *comps):
    623         """Creates the specified directory if it doesn't already exist."""
    624         self._filesystem.maybe_make_directory(*comps)
    625606
    626607    def name(self):
  • trunk/Tools/Scripts/webkitpy/layout_tests/port/win.py

    r105951 r107361  
    4646    VERSION_FALLBACK_ORDER = ["win-xp", "win-vista", "win-7sp0", "win"]
    4747
    48     def compare_text(self, expected_text, actual_text):
     48    def do_text_results_differ(self, expected_text, actual_text):
    4949        # Sanity was restored in WK2, so we don't need this hack there.
    5050        if self.get_option('webkit_test_runner'):
    51             return ApplePort.compare_text(self, expected_text, actual_text)
     51            return ApplePort.do_text_results_differ(self, expected_text, actual_text)
    5252
    5353        # This is a hack (which dates back to ORWT).
  • trunk/Tools/Scripts/webkitpy/layout_tests/port/win_unittest.py

    r105951 r107361  
    8686        expected = "EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification\nfoo\nEDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification\n"
    8787        port = self.make_port()
    88         self.assertFalse(port.compare_text(expected, "foo\n"))
    89         self.assertTrue(port.compare_text(expected, "foo"))
    90         self.assertTrue(port.compare_text(expected, "bar"))
     88        self.assertFalse(port.do_text_results_differ(expected, "foo\n"))
     89        self.assertTrue(port.do_text_results_differ(expected, "foo"))
     90        self.assertTrue(port.do_text_results_differ(expected, "bar"))
    9191
    9292        # This hack doesn't exist in WK2.
    9393        port._options = MockOptions(webkit_test_runner=True)
    94         self.assertTrue(port.compare_text(expected, "foo\n"))
     94        self.assertTrue(port.do_text_results_differ(expected, "foo\n"))
    9595
    9696    def test_operating_system(self):
  • trunk/Tools/Scripts/webkitpy/layout_tests/servers/apache_http_server.py

    r91121 r107361  
    5858                          {'port': 8443, 'sslcert': True}]
    5959        self._output_dir = output_dir
    60         port_obj.maybe_make_directory(output_dir)
     60        self._filesystem.maybe_make_directory(output_dir)
    6161
    6262        self._pid_file = self._filesystem.join(self._runtime_path, '%s.pid' % self._name)
  • trunk/Tools/Scripts/webkitpy/layout_tests/servers/http_server_base.py

    r90534 r107361  
    6666
    6767        self._runtime_path = self._filesystem.join(tmpdir, "WebKit")
    68         port_obj.maybe_make_directory(self._runtime_path)
     68        self._filesystem.maybe_make_directory(self._runtime_path)
    6969
    7070    def start(self):
  • trunk/Tools/Scripts/webkitpy/to_be_moved/rebaseline_chromium_webkit_tests.py

    r107136 r107361  
    513513            return self._port.diff_image(output1, output2)[0]
    514514
    515         return self._port.compare_text(output1, output2)
     515        return self._port.do_text_results_differ(output1, output2)
    516516
    517517    def _delete_baseline(self, filename):
Note: See TracChangeset for help on using the changeset viewer.