Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(612)

Unified Diff: third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/port/win_unittest.py

Issue 2578213005: Use underscores to separate words in filenames in webkitpy. (Closed)
Patch Set: Fix check for attribute in output_capture.py. 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
Index: third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/port/win_unittest.py
diff --git a/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/port/win_unittest.py b/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/port/win_unittest.py
index 081ef3f7bea2e340c348299bd8d4115494a1620b..bbd820591c75ce8e232097c2def26bfbc6b94c5c 100644
--- a/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/port/win_unittest.py
+++ b/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/port/win_unittest.py
@@ -28,7 +28,7 @@
import optparse
-from webkitpy.common.system import outputcapture
+from webkitpy.common.system import output_capture
from webkitpy.common.system.executive_mock import MockExecutive
from webkitpy.layout_tests.port import port_testcase
from webkitpy.layout_tests.port import win
@@ -44,7 +44,7 @@ class WinPortTest(port_testcase.PortTestCase):
def test_setup_environ_for_server(self):
port = self.make_port()
port._executive = MockExecutive(should_log=True)
- output = outputcapture.OutputCapture()
+ output = output_capture.OutputCapture()
orig_environ = port.host.environ.copy()
env = output.assert_outputs(self, port.setup_environ_for_server)
self.assertEqual(orig_environ["PATH"], port.host.environ.get("PATH"))
@@ -59,7 +59,7 @@ class WinPortTest(port_testcase.PortTestCase):
port = self.make_port(options=optparse.Values({'register_cygwin': True, 'results_directory': '/'}))
port._executive = MockExecutive(should_log=True)
expected_logs = "MOCK run_command: ['/mock-checkout/third_party/cygwin/setup_mount.bat'], cwd=None\n"
- output = outputcapture.OutputCapture()
+ output = output_capture.OutputCapture()
output.assert_outputs(self, port.setup_environ_for_server, expected_logs=expected_logs)
def assert_name(self, port_name, os_version_string, expected):

Powered by Google App Engine
This is Rietveld 408576698