Tools/Scripts/webkitpy/layout_tests/port/chromium_linux_unittest.py - Issue 15790007: Fix webkitpy unittests.

Side by Side Diff

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

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

Side by Side Diff: Tools/Scripts/webkitpy/layout_tests/port/chromium_linux_unittest.py

Issue 15790007: Fix webkitpy unittests. (Closed) Base URL: svn://svn.chromium.org/blink/trunk

Patch Set: 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 unified diff | Download patch | Annotate | Revision Log

OLD	NEW
1 # Copyright (C) 2011 Google Inc. All rights reserved.	1 # Copyright (C) 2011 Google Inc. All rights reserved.

2 #	2 #

3 # Redistribution and use in source and binary forms, with or without	3 # Redistribution and use in source and binary forms, with or without

4 # modification, are permitted provided that the following conditions are	4 # modification, are permitted provided that the following conditions are

5 # met:	5 # met:

6 #	6 #

7 # * Redistributions of source code must retain the above copyright	7 # * Redistributions of source code must retain the above copyright

8 # notice, this list of conditions and the following disclaimer.	8 # notice, this list of conditions and the following disclaimer.

9 # * Redistributions in binary form must reproduce the above	9 # * Redistributions in binary form must reproduce the above

10 # copyright notice, this list of conditions and the following disclaimer	10 # copyright notice, this list of conditions and the following disclaimer

(...skipping 86 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
97	97

98 # Test that optional relative paths are returned unmodified.	98 # Test that optional relative paths are returned unmodified.

99 options = MockOptions(configuration='Release', build_directory='foo')	99 options = MockOptions(configuration='Release', build_directory='foo')

100 self.assert_build_path(options, ['/mock-checkout/Source/WebKit/chromium/ out/Release'], 'foo/Release')	100 self.assert_build_path(options, ['/mock-checkout/Source/WebKit/chromium/ out/Release'], 'foo/Release')

101	101

102 # Test that we prefer the legacy dir over the new dir.	102 # Test that we prefer the legacy dir over the new dir.

103 options = MockOptions(configuration='Release', build_directory=None)	103 options = MockOptions(configuration='Release', build_directory=None)

104 self.assert_build_path(options, ['/mock-checkout/Source/WebKit/chromium/ sconsbuild/Release', '/mock-checkout/Source/WebKit/chromium/out/Release'], '/moc k-checkout/Source/WebKit/chromium/sconsbuild/Release')	104 self.assert_build_path(options, ['/mock-checkout/Source/WebKit/chromium/ sconsbuild/Release', '/mock-checkout/Source/WebKit/chromium/out/Release'], '/moc k-checkout/Source/WebKit/chromium/sconsbuild/Release')

105	105

106 def test_driver_name_option(self):	106 def test_driver_name_option(self):

107 self.assertTrue(self.make_port()._path_to_driver().endswith('DumpRenderT ree'))	107 self.assertTrue(self.make_port()._path_to_driver().endswith('content_she ll'))

108 self.assertTrue(self.make_port(options=MockOptions(driver_name='OtherDri ver'))._path_to_driver().endswith('OtherDriver'))	108 self.assertTrue(self.make_port(options=MockOptions(driver_name='OtherDri ver'))._path_to_driver().endswith('OtherDriver'))

109	109

110 def test_path_to_image_diff(self):	110 def test_path_to_image_diff(self):

111 self.assertEqual(self.make_port()._path_to_image_diff(), '/mock-checkout /out/Release/ImageDiff')	111 self.assertEqual(self.make_port()._path_to_image_diff(), '/mock-checkout /out/Release/ImageDiff')

OLD	NEW