Attachment #121746 for bug #75884

View Details Raw Unified Return to Bug 75884

| Differences between



2012-01-09  Dirk Pranke  <dpranke@chromium.org>

        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 NOBODY (OOPS!).

        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/port/mock_drt_unittest.py:
        (MockChromiumDRTTest.test_pixeltest__fails):

2012-01-06  Adam Roben  <aroben@apple.com>

        Print an error message when NRWT can't run Apache



                    '#EOF\n']

    def test_pixeltest__fails(self):
        # We need to mess with LAYOUT_TEST_DIR here because path.abspath_to_uri()
        # isn't aware of MockFileSystems and will treat the path as a windows
        # path name (which should contain a drive letter).
        # We don't change LAYOUT_TEST_DIR everywhere when running on Windows
        # because we'd have to update lots of tests.
        orig_dir = test.LAYOUT_TEST_DIR
        if sys.platform == 'win32':
            test.LAYOUT_TEST_DIR = 'c:/test.checkout/LayoutTests'
            url = '#URL:file:///c:/test.checkout/LayoutTests/failures/expected/checksum.html'
        else:
            url = '#URL:file:///test.checkout/LayoutTests/failures/expected/checksum.html'
        host = MockHost()
        try:
            self.assertTest('failures/expected/checksum.html', pixel_tests=True,
                expected_checksum='wrong-checksum',

                drt_output=[url + '\n',
                            '#MD5:checksum-checksum\n',
                            'checksum-txt',
                            '\n',
                            '#EOF\n'],
                host=host)
        finally:
            test.LAYOUT_TEST_DIR = orig_dir
        self.assertEquals(host.filesystem.written_files,
            {'/tmp/png_result0.png': 'checksum\x8a-pngtEXtchecksum\x00checksum-checksum'})


Return to Bug 75884

Lines 235-249 class MockChromiumDRTTest(MockDRTTest): a/Tools/Scripts/webkitpy/layout_tests/port/mock_drt_unittest.py_sec1
- a/Tools/Scripts/webkitpy/layout_tests/port/mock_drt_unittest.py -8 / +23 lines
235	'#EOF\n']	235	'#EOF\n']
236		236
237	def test_pixeltest__fails(self):	237	def test_pixeltest__fails(self):
		238	# We need to mess with LAYOUT_TEST_DIR here because path.abspath_to_uri()
		239	# isn't aware of MockFileSystems and will treat the path as a windows
		240	# path name (which should contain a drive letter).
		241	# We don't change LAYOUT_TEST_DIR everywhere when running on Windows
		242	# because we'd have to update lots of tests.
		243	orig_dir = test.LAYOUT_TEST_DIR
		244	if sys.platform == 'win32':
		245	test.LAYOUT_TEST_DIR = 'c:/test.checkout/LayoutTests'
		246	url = '#URL:file:///c:/test.checkout/LayoutTests/failures/expected/checksum.html'
		247	else:
		248	url = '#URL:file:///test.checkout/LayoutTests/failures/expected/checksum.html'
238	host = MockHost()	249	host = MockHost()
239	self.assertTest('failures/expected/checksum.html', pixel_tests=True,	250	try:
240	expected_checksum='wrong-checksum',	251	self.assertTest('failures/expected/checksum.html', pixel_tests=True,
241	drt_output=['#URL:file:///test.checkout/LayoutTests/failures/expected/checksum.html\n',	252	expected_checksum='wrong-checksum',
242	'#MD5:checksum-checksum\n',	253
243	'checksum-txt',	254	drt_output=[url + '\n',
244	'\n',	255	'#MD5:checksum-checksum\n',
245	'#EOF\n'],	256	'checksum-txt',
246	host=host)	257	'\n',
		258	'#EOF\n'],
		259	host=host)
		260	finally:
		261	test.LAYOUT_TEST_DIR = orig_dir
247	self.assertEquals(host.filesystem.written_files,	262	self.assertEquals(host.filesystem.written_files,
248	{'/tmp/png_result0.png': 'checksum\x8a-pngtEXtchecksum\x00checksum-checksum'})	263	{'/tmp/png_result0.png': 'checksum\x8a-pngtEXtchecksum\x00checksum-checksum'})
249		264

Lines 1-3 a/Tools/ChangeLog_sec1
- a/Tools/ChangeLog +14 lines
		1	2012-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 NOBODY (OOPS!).
		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/port/mock_drt_unittest.py:
		13	(MockChromiumDRTTest.test_pixeltest__fails):
		14
1	2012-01-06 Adam Roben <aroben@apple.com>	15	2012-01-06 Adam Roben <aroben@apple.com>
2		16
3	Print an error message when NRWT can't run Apache	17	Print an error message when NRWT can't run Apache