third_party/WebKit/Tools/Scripts/webkitpy/w3c/test_importer_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/w3c/test_importer_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/w3c/test_exporter_unittest.py ('k') | third_party/WebKit/Tools/Scripts/webkitpy/w3c/update_w3c_test_expectations_unittest.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Tools/Scripts/webkitpy/w3c/test_importer_unittest.py

diff --git a/third_party/WebKit/Tools/Scripts/webkitpy/w3c/test_importer_unittest.py b/third_party/WebKit/Tools/Scripts/webkitpy/w3c/test_importer_unittest.py

index f8683ee46b2408dd3c0371c8b337418d0ffa66b0..1ff68fe111388b38c0b9723923e9b1a969df8daf 100644

--- a/third_party/WebKit/Tools/Scripts/webkitpy/w3c/test_importer_unittest.py

+++ b/third_party/WebKit/Tools/Scripts/webkitpy/w3c/test_importer_unittest.py

@@ -29,8 +29,8 @@ import optparse

import unittest

from webkitpy.common.host_mock import MockHost

+from webkitpy.common.system.executive_mock import MockExecutive, ScriptError

from webkitpy.common.system.filesystem_mock import MockFileSystem

-from webkitpy.common.system.executive_mock import MockExecutive2, ScriptError

from webkitpy.w3c.test_importer import TestImporter

@@ -65,7 +65,7 @@ class TestImporterTest(unittest.TestCase):

def test_import_dir_with_no_tests(self):

host = MockHost()

- host.executive = MockExecutive2(exception=ScriptError(

+ host.executive = MockExecutive(exception=ScriptError(

"abort: no repository found in '/Volumes/Source/src/wk/Tools/Scripts/webkitpy/w3c'"))

host.filesystem = MockFileSystem(files=FAKE_FILES)

importer = TestImporter(host, FAKE_SOURCE_REPO_DIR, self.options())