Changeset 104524 in webkit


Ignore:
Timestamp:
Jan 9, 2012 5:32:54 PM (12 years ago)
Author:
dpranke@chromium.org
Message:

webkitpy.layout_tests.port.mock_drt_unittest.MockChromiumDRTTest has been failing on cr-win
​https://bugs.webkit.org/show_bug.cgi?id=75884

Reviewed by Ryosuke Niwa.

Fix regression introduced (revealed?) in r104340. Chromium file
url syntax is different on win32 and the test results weren't
expecting that.

  • Scripts/webkitpy/layout_tests/models/test_expectations.py:

(TestExpectations._report_errors):

  • Scripts/webkitpy/layout_tests/models/test_expectations_unittest.py:

(test_parse_error_nonfatal):

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

(MockDRTTest.input_line):
(MockChromiumDRTTest.test_pixeltestfails):

  • Scripts/webkitpy/layout_tests/port/test.py:
  • Scripts/webkitpy/to_be_moved/rebaseline_chromium_webkit_tests_unittest.py:

(TestRebaseliner.make_rebaseliner):
(TestRebaseliner.test_one_platform):
(TestRebaseliner.test_all_platforms):
(TestRebaseliner.test_png_file_with_comment):
(TestRebaseliner.test_png_file_with_comment_remove_old_checksum):
(TestRebaseliner.test_png_file_with_comment_as_duplicate):
(TestRealMain.test_all_platforms):

Location:
trunk/Tools
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/Tools/ChangeLog

    r104495 r104524  
     12012-01-09  Dirk Pranke  <dpranke@chromium.org>
     2
     3        webkitpy.layout_tests.port.mock_drt_unittest.MockChromiumDRTTest has been failing on cr-win
     4        https://bugs.webkit.org/show_bug.cgi?id=75884
     5
     6        Reviewed by Ryosuke Niwa.
     7
     8        Fix regression introduced (revealed?) in r104340. Chromium file         
     9        url syntax is different on win32 and the test results weren't           
     10        expecting that.                                                         
     11
     12        * Scripts/webkitpy/layout_tests/models/test_expectations.py:
     13        (TestExpectations._report_errors):
     14        * Scripts/webkitpy/layout_tests/models/test_expectations_unittest.py:
     15        (test_parse_error_nonfatal):
     16        * Scripts/webkitpy/layout_tests/port/mock_drt_unittest.py:
     17        (MockDRTTest.input_line):
     18        (MockChromiumDRTTest.test_pixeltest__fails):
     19        * Scripts/webkitpy/layout_tests/port/test.py:
     20        * Scripts/webkitpy/to_be_moved/rebaseline_chromium_webkit_tests_unittest.py:
     21        (TestRebaseliner.make_rebaseliner):
     22        (TestRebaseliner.test_one_platform):
     23        (TestRebaseliner.test_all_platforms):
     24        (TestRebaseliner.test_png_file_with_comment):
     25        (TestRebaseliner.test_png_file_with_comment_remove_old_checksum):
     26        (TestRebaseliner.test_png_file_with_comment_as_duplicate):
     27        (TestRealMain.test_all_platforms):
     28
    1292012-01-09  Dirk Pranke  <dpranke@chromium.org>
    230

  • trunk/Tools/Scripts/webkitpy/layout_tests/models/test_expectations.py

    r101979 r104524  
    790790
    791791        if len(errors) or len(warnings):
    792             webkit_base_path = self._port.webkit_base()
    793792            test_expectation_path = self._port.path_to_test_expectations_file()
    794             test_expectation_relative_path = test_expectation_path[len(webkit_base_path):].lstrip('/')
    795             failure_title = "FAILURES FOR %s in %s" % (str(self._test_config), test_expectation_relative_path)
     793            failure_title = "FAILURES FOR %s in %s" % (str(self._test_config), test_expectation_path)
    796794            _log.error(failure_title)
    797795

  • trunk/Tools/Scripts/webkitpy/layout_tests/models/test_expectations_unittest.py

    r103357 r104524  
    200200        except ParseError, e:
    201201            self.assertTrue(e.fatal)
    202             exp_errors = [u"FAILURES FOR %s in LayoutTests/platform/test/test_expectations.txt" % self._port.test_configuration(),
     202            exp_errors = [u"FAILURES FOR %s in %s" % (self._port.test_configuration(), self._port.path_to_test_expectations_file()),
    203203                          u"Line:1 Unrecognized modifier 'foo' failures/expected/text.html",
    204204                          u"Line:2 Missing expectations SKIP : failures/expected/image.html"]
    … …  
    213213        except ParseError, e:
    214214            self.assertFalse(e.fatal)
    215             exp_errors = [u'FAILURES FOR %s in LayoutTests/platform/test/test_expectations.txt' % self._port.test_configuration(),
     215            exp_errors = [u'FAILURES FOR %s in %s' % (self._port.test_configuration(), self._port.path_to_test_expectations_file()),
    216216                          u'Line:1 Test lacks BUG modifier. failures/expected/text.html']
    217217            self.assertEqual(str(e), '\n'.join(map(str, exp_errors)))

  • trunk/Tools/Scripts/webkitpy/layout_tests/port/mock_drt_unittest.py

    r104416 r104524  
    9191    def input_line(self, port, test_name, checksum=None):
    9292        url = port.create_driver(0).test_to_uri(test_name)
    93         # FIXME: we shouldn't have to work around platform-specific issues
    94         # here.
    95         if url.startswith('file:////'):
    96             url = url[len('file:////') - 1:]
    97         if url.startswith('file:///'):
    98             url = url[len('file:///') - 1:]
     93        if url.startswith('file://'):
     94            if sys.platform == 'win32':
     95                url = url[len('file:///'):]
     96            else:
     97                url = url[len('file://'):]
    9998
    10099        if checksum:
    … …  
    237236    def test_pixeltest__fails(self):
    238237        host = MockHost()
     238        url = '#URL:file://%s/failures/expected/checksum.html' % host.port_factory.get('test').layout_tests_dir()
    239239        self.assertTest('failures/expected/checksum.html', pixel_tests=True,
    240240            expected_checksum='wrong-checksum',
    241             drt_output=['#URL:file:///test.checkout/LayoutTests/failures/expected/checksum.html\n',
     241            drt_output=[url + '\n',
    242242                        '#MD5:checksum-checksum\n',
    243243                        'checksum-txt',

  • trunk/Tools/Scripts/webkitpy/layout_tests/port/test.py

    r104340 r104524  
    3232
    3333import base64
     34import sys
    3435import time
    3536
    … …  
    221222# related to this before.
    222223
    223 LAYOUT_TEST_DIR = '/test.checkout/LayoutTests'
     224if sys.platform == 'win32':
     225    LAYOUT_TEST_DIR = 'c:/test.checkout/LayoutTests'
     226else:
     227    LAYOUT_TEST_DIR = '/test.checkout/LayoutTests'
    224228
    225229

  • trunk/Tools/Scripts/webkitpy/to_be_moved/rebaseline_chromium_webkit_tests_unittest.py

    r104416 r104524  
    196196
    197197        # FIXME: SCM module doesn't handle paths that aren't relative to the checkout_root consistently.
    198         filesystem.chdir("/test.checkout")
     198        filesystem.chdir(filesystem.dirname(host_port_obj.layout_tests_dir()))
    199199
    200200        rebaseliner = rebaseline_chromium_webkit_tests.Rebaseliner(host, host_port_obj,
    … …  
    228228
    229229        rebaseliner.run()
     230        layout_test_dir = rebaseliner._port.layout_tests_dir()
    230231        # We expect to have written 13 files over the course of this rebaseline:
    231232        # *) 3 files in /__im_tmp for the extracted archive members
    232         # *) 3 new baselines under '/test.checkout/LayoutTests'
     233        # *) 3 new baselines under layout_test_dir
    233234        # *) 4 files in /tmp for the new and old baselines in the result file
    234235        #    (-{old,new}.{txt,png}
    … …  
    237238        # *) 1 updated test_expectations file
    238239        self.assertEqual(len(filesystem.written_files), 13)
    239         self.assertEqual(filesystem.files['/test.checkout/LayoutTests/platform/test-mac-leopard/failures/expected/image-expected.checksum'], 'new-image-checksum')
    240         self.assertEqual(filesystem.files['/test.checkout/LayoutTests/platform/test-mac-leopard/failures/expected/image-expected.png'], 'new-image-png')
    241         self.assertEqual(filesystem.files['/test.checkout/LayoutTests/platform/test-mac-leopard/failures/expected/image-expected.txt'], 'new-image-txt')
     240        self.assertEqual(filesystem.files[layout_test_dir + '/platform/test-mac-leopard/failures/expected/image-expected.checksum'], 'new-image-checksum')
     241        self.assertEqual(filesystem.files[layout_test_dir + '/platform/test-mac-leopard/failures/expected/image-expected.png'], 'new-image-png')
     242        self.assertEqual(filesystem.files[layout_test_dir + '/platform/test-mac-leopard/failures/expected/image-expected.txt'], 'new-image-txt')
    242243
    243244    def test_all_platforms(self):
    244245        rebaseliner, filesystem = self.make_rebaseliner(
    245246            "BUGX REBASELINE : failures/expected/image.html = IMAGE")
     247        layout_test_dir = rebaseliner._port.layout_tests_dir()
    246248        rebaseliner.run()
    247249        # See comment in test_one_platform for an explanation of the 13 written tests.
    … …  
    249251        # rebaseliner only ever does one.
    250252        self.assertEqual(len(filesystem.written_files), 13)
    251         self.assertEqual(filesystem.files['/test.checkout/LayoutTests/platform/test-mac-leopard/failures/expected/image-expected.checksum'], 'new-image-checksum')
    252         self.assertEqual(filesystem.files['/test.checkout/LayoutTests/platform/test-mac-leopard/failures/expected/image-expected.png'], 'new-image-png')
    253         self.assertEqual(filesystem.files['/test.checkout/LayoutTests/platform/test-mac-leopard/failures/expected/image-expected.txt'], 'new-image-txt')
     253        self.assertEqual(filesystem.files[layout_test_dir + '/platform/test-mac-leopard/failures/expected/image-expected.checksum'], 'new-image-checksum')
     254        self.assertEqual(filesystem.files[layout_test_dir + '/platform/test-mac-leopard/failures/expected/image-expected.png'], 'new-image-png')
     255        self.assertEqual(filesystem.files[layout_test_dir + '/platform/test-mac-leopard/failures/expected/image-expected.txt'], 'new-image-txt')
    254256
    255257    def test_png_file_with_comment(self):
    256258        rebaseliner, filesystem = self.make_rebaseliner(
    257259            "BUGX REBASELINE MAC : failures/expected/image_checksum.html = IMAGE")
     260        layout_test_dir = rebaseliner._port.layout_tests_dir()
    258261        compile_success = rebaseliner._compile_rebaselining_tests()
    259262        self.assertTrue(compile_success)
    … …  
    263266        # write 2 expectations (the png and the txt file).
    264267        self.assertEqual(len(filesystem.written_files), 12)
    265         self.assertEqual(filesystem.files['/test.checkout/LayoutTests/platform/test-mac-leopard/failures/expected/image_checksum-expected.png'], 'tEXtchecksum\x000123456789')
    266         self.assertEqual(filesystem.files['/test.checkout/LayoutTests/platform/test-mac-leopard/failures/expected/image_checksum-expected.txt'], 'png-comment-txt')
    267         self.assertFalse(filesystem.files.get('/test.checkout/LayoutTests/platform/test-mac-leopard/failures/expected/image_checksum-expected.checksum', None))
     268        self.assertEqual(filesystem.files[layout_test_dir + '/platform/test-mac-leopard/failures/expected/image_checksum-expected.png'], 'tEXtchecksum\x000123456789')
     269        self.assertEqual(filesystem.files[layout_test_dir + '/platform/test-mac-leopard/failures/expected/image_checksum-expected.txt'], 'png-comment-txt')
     270        self.assertFalse(filesystem.files.get(layout_test_dir + '/platform/test-mac-leopard/failures/expected/image_checksum-expected.checksum', None))
    268271
    269272    def test_png_file_with_comment_remove_old_checksum(self):
    270273        rebaseliner, filesystem = self.make_rebaseliner(
    271274            "BUGX REBASELINE MAC : failures/expected/image_checksum.html = IMAGE")
    272         filesystem.files['/test.checkout/LayoutTests/platform/test-mac-leopard/failures/expected/image_checksum-expected.png'] = 'old'
    273         filesystem.files['/test.checkout/LayoutTests/platform/test-mac-leopard/failures/expected/image_checksum-expected.checksum'] = 'old'
    274         filesystem.files['/test.checkout/LayoutTests/platform/test-mac-leopard/failures/expected/image_checksum-expected.txt'] = 'old'
     275        layout_test_dir = rebaseliner._port.layout_tests_dir()
     276        filesystem.files[layout_test_dir + '/platform/test-mac-leopard/failures/expected/image_checksum-expected.png'] = 'old'
     277        filesystem.files[layout_test_dir + '/platform/test-mac-leopard/failures/expected/image_checksum-expected.checksum'] = 'old'
     278        filesystem.files[layout_test_dir + '/platform/test-mac-leopard/failures/expected/image_checksum-expected.txt'] = 'old'
    275279
    276280        compile_success = rebaseliner._compile_rebaselining_tests()
    … …  
    281285        # because we also delete the old checksum.
    282286        self.assertEqual(len(filesystem.written_files), 13)
    283         self.assertEqual(filesystem.files['/test.checkout/LayoutTests/platform/test-mac-leopard/failures/expected/image_checksum-expected.png'], 'tEXtchecksum\x000123456789')
    284         self.assertEqual(filesystem.files['/test.checkout/LayoutTests/platform/test-mac-leopard/failures/expected/image_checksum-expected.txt'], 'png-comment-txt')
    285         self.assertEqual(filesystem.files.get('/test.checkout/LayoutTests/platform/test-mac-leopard/failures/expected/image_checksum-expected.checksum', None), None)
     287        self.assertEqual(filesystem.files[layout_test_dir + '/platform/test-mac-leopard/failures/expected/image_checksum-expected.png'], 'tEXtchecksum\x000123456789')
     288        self.assertEqual(filesystem.files[layout_test_dir + '/platform/test-mac-leopard/failures/expected/image_checksum-expected.txt'], 'png-comment-txt')
     289        self.assertEqual(filesystem.files.get(layout_test_dir + '/platform/test-mac-leopard/failures/expected/image_checksum-expected.checksum', None), None)
    286290
    287291    def test_png_file_with_comment_as_duplicate(self):
    288292        rebaseliner, filesystem = self.make_rebaseliner(
    289293            "BUGX REBASELINE MAC : failures/expected/image_checksum.html = IMAGE")
    290         filesystem.files['/test.checkout/LayoutTests/platform/test-mac-snowleopard/failures/expected/image_checksum-expected.png'] = 'tEXtchecksum\x000123456789'
    291         filesystem.files['/test.checkout/LayoutTests/platform/test-mac-snowleopard/failures/expected/image_checksum-expected.txt'] = 'png-comment-txt'
     294        layout_test_dir = rebaseliner._port.layout_tests_dir()
     295        filesystem.files[layout_test_dir + '/platform/test-mac-snowleopard/failures/expected/image_checksum-expected.png'] = 'tEXtchecksum\x000123456789'
     296        filesystem.files[layout_test_dir + '/platform/test-mac-snowleopard/failures/expected/image_checksum-expected.txt'] = 'png-comment-txt'
    292297
    293298        compile_success = rebaseliner._compile_rebaselining_tests()
    … …  
    295300        self.assertEqual(set(['failures/expected/image_checksum.html']), rebaseliner._rebaselining_tests)
    296301        rebaseliner.run()
    297         self.assertEqual(filesystem.files.get('/test.checkout/LayoutTests/platform/test-mac-leopard/failures/expected/image_checksum-expected.png', None), None)
    298         self.assertEqual(filesystem.files.get('/test.checkout/LayoutTests/platform/test-mac-leopard/failures/expected/image_checksum-expected.txt', None), None)
    299         self.assertEqual(filesystem.files.get('/test.checkout/LayoutTests/platform/test-mac-leopard/failures/expected/image_checksum-expected.checksum', None), None)
     302        self.assertEqual(filesystem.files.get(layout_test_dir + '/platform/test-mac-leopard/failures/expected/image_checksum-expected.png', None), None)
     303        self.assertEqual(filesystem.files.get(layout_test_dir + '/platform/test-mac-leopard/failures/expected/image_checksum-expected.txt', None), None)
     304        self.assertEqual(filesystem.files.get(layout_test_dir + '/platform/test-mac-leopard/failures/expected/image_checksum-expected.checksum', None), None)
    300305
    301306    def test_diff_baselines_txt(self):
    … …  
    332337
    333338        # FIXME: SCM module doesn't handle paths that aren't relative to the checkout_root consistently.
    334         filesystem.chdir("/test.checkout")
     339        filesystem.chdir(filesystem.dirname(host_port_obj.layout_tests_dir()))
    335340
    336341        oc = outputcapture.OutputCapture()
Note: See TracChangeset for help on using the changeset viewer.