Tools/Scripts/webkitpy/w3c/test_parser_unittest.py - Issue 16171009: switch import-w3c-tests from using print statements to logging

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: Tools/Scripts/webkitpy/w3c/test_parser_unittest.py

Issue 16171009: switch import-w3c-tests from using print statements to logging (Closed) Base URL: svn://svn.chromium.org/blink/trunk

Patch Set: clean up paths a bit Created 7 years, 7 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

Index: Tools/Scripts/webkitpy/w3c/test_parser_unittest.py

diff --git a/Tools/Scripts/webkitpy/w3c/test_parser_unittest.py b/Tools/Scripts/webkitpy/w3c/test_parser_unittest.py

index 3b697267c68a3d52b12a9361caa417aa43cbff89..7fb0c5b04a74bb01bccfd40aa2d6fe9cf16d1df7 100644

--- a/Tools/Scripts/webkitpy/w3c/test_parser_unittest.py

+++ b/Tools/Scripts/webkitpy/w3c/test_parser_unittest.py

@@ -69,7 +69,7 @@ class TestParserTest(unittest.TestCase):

parser = TestParser(options, test_path + 'somefile.html')

test_info = parser.analyze_test(test_contents=test_html)

finally:

- output, _, _ = oc.restore_output()

+ _, _, logs = oc.restore_output()

self.assertNotEqual(test_info, None, 'did not find a test')

self.assertTrue('test' in test_info.keys(), 'did not find a test file')

@@ -78,7 +78,7 @@ class TestParserTest(unittest.TestCase):

self.assertFalse('refsupport' in test_info.keys(), 'there should be no refsupport files for this test')

self.assertFalse('jstest' in test_info.keys(), 'test should not have been analyzed as a jstest')

- self.assertTrue(output.startswith('Warning'), 'no warning about multiple matches')

+ self.assertEqual(logs, 'Multiple references are not supported. Importing the first ref defined in somefile.html\n')

def test_analyze_test_reftest_match_and_mismatch(self):

test_html = """<head>

@@ -95,7 +95,7 @@ class TestParserTest(unittest.TestCase):

parser = TestParser(options, test_path + 'somefile.html')

test_info = parser.analyze_test(test_contents=test_html)

finally:

- output, _, _ = oc.restore_output()

+ _, _, logs = oc.restore_output()

self.assertNotEqual(test_info, None, 'did not find a test')

self.assertTrue('test' in test_info.keys(), 'did not find a test file')

@@ -104,8 +104,7 @@ class TestParserTest(unittest.TestCase):

self.assertFalse('refsupport' in test_info.keys(), 'there should be no refsupport files for this test')

self.assertFalse('jstest' in test_info.keys(), 'test should not have been analyzed as a jstest')

- warnings = output.splitlines()

- self.assertEquals(warnings, ["Warning: Webkit does not support multiple references. Importing the first ref defined in somefile.html"])

+ self.assertEqual(logs, 'Multiple references are not supported. Importing the first ref defined in somefile.html\n')

def test_analyze_test_reftest_with_ref_support_Files(self):

""" Tests analyze_test() using a reftest that has refers to a reference file outside of the tests directory and the reference file has paths to other support files """

« Tools/Scripts/webkitpy/w3c/test_importer.py ('K') | « Tools/Scripts/webkitpy/w3c/test_parser.py ('k') | no next file » | no next file with comments »