third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/port/linux_unittest.py - Issue 2605873004: Unify MockExecutive and MockExecutive2.

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: third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/port/linux_unittest.py

Issue 2605873004: Unify MockExecutive and MockExecutive2. (Closed)

Patch Set: Created 4 years 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

« no previous file with comments | « third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/port/browser_test_unittest.py ('k') | third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/port/port_testcase.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/port/linux_unittest.py

diff --git a/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/port/linux_unittest.py b/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/port/linux_unittest.py

index 27af7b58b37aea8be94898ceaeda42f654cb4218..fe363f73c44d767964611998b915a8c11137a37d 100644

--- a/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/port/linux_unittest.py

+++ b/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/port/linux_unittest.py

@@ -28,7 +28,7 @@

import optparse

-from webkitpy.common.system import executive_mock

+from webkitpy.common.system.executive_mock import MockExecutive

from webkitpy.common.system.system_host_mock import MockSystemHost

from webkitpy.layout_tests.port import linux

from webkitpy.layout_tests.port import port_testcase

@@ -47,7 +47,7 @@ class LinuxPortTest(port_testcase.PortTestCase):

host = MockSystemHost(os_name=self.os_name, os_version=(os_version or self.os_version))

host.filesystem.isfile = lambda x: 'content_shell' in x

if driver_file_output:

- host.executive = executive_mock.MockExecutive2(driver_file_output)

+ host.executive = MockExecutive(driver_file_output)

port = self.make_port(host=host, port_name=port_name, os_version=os_version)

self.assertEqual(port.name(), expected_name)

self.assertEqual(port.version(), expected_version)