third_party/WebKit/Tools/Scripts/webkitpy/common/system/platform_info_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/common/system/platform_info_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/common/system/executive_mock.py ('k') | third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/port/android_unittest.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Tools/Scripts/webkitpy/common/system/platform_info_unittest.py

diff --git a/third_party/WebKit/Tools/Scripts/webkitpy/common/system/platform_info_unittest.py b/third_party/WebKit/Tools/Scripts/webkitpy/common/system/platform_info_unittest.py

index a6f6fb997fb4082e3a7770a7cf6893fa8c1d56e0..eda5bc745f1872638a86a4e946ff60dfe3184a02 100644

--- a/third_party/WebKit/Tools/Scripts/webkitpy/common/system/platform_info_unittest.py

+++ b/third_party/WebKit/Tools/Scripts/webkitpy/common/system/platform_info_unittest.py

@@ -31,7 +31,7 @@ import sys

import unittest

from webkitpy.common.system.executive import Executive

-from webkitpy.common.system.executive_mock import MockExecutive2

+from webkitpy.common.system.executive_mock import MockExecutive

from webkitpy.common.system.filesystem import FileSystem

from webkitpy.common.system.filesystem_mock import MockFileSystem

from webkitpy.common.system.platform_info import PlatformInfo

@@ -68,8 +68,8 @@ def fake_platform(mac_version_string='10.6.3', release_string='bar', linux_versi

def fake_executive(output=None):

if output:

- return MockExecutive2(output=output)

- return MockExecutive2(exception=SystemError)

+ return MockExecutive(output=output)

+ return MockExecutive(exception=SystemError)

class TestPlatformInfo(unittest.TestCase):