| Index: third_party/WebKit/Tools/Scripts/webkitpy/common/system/output_capture_unittest.py
|
| diff --git a/third_party/WebKit/Tools/Scripts/webkitpy/common/system/outputcapture_unittest.py b/third_party/WebKit/Tools/Scripts/webkitpy/common/system/output_capture_unittest.py
|
| similarity index 90%
|
| rename from third_party/WebKit/Tools/Scripts/webkitpy/common/system/outputcapture_unittest.py
|
| rename to third_party/WebKit/Tools/Scripts/webkitpy/common/system/output_capture_unittest.py
|
| index c7de905f21fcbeeb63e8ddf3610c0f6341bfb21e..05f3e329383b977349ec01972d32158617ed70b5 100644
|
| --- a/third_party/WebKit/Tools/Scripts/webkitpy/common/system/outputcapture_unittest.py
|
| +++ b/third_party/WebKit/Tools/Scripts/webkitpy/common/system/output_capture_unittest.py
|
| @@ -23,7 +23,7 @@
|
| import logging
|
| import unittest
|
|
|
| -from webkitpy.common.system.outputcapture import OutputCapture
|
| +from webkitpy.common.system.output_capture import OutputCapture
|
|
|
|
|
| _log = logging.getLogger(__name__)
|
| @@ -40,7 +40,7 @@ class OutputCaptureTest(unittest.TestCase):
|
| _log.error('ERROR')
|
| _log.critical('CRITICAL')
|
|
|
| - def assertLogged(self, expected_logs):
|
| + def assert_logged(self, expected_logs):
|
| actual_stdout, actual_stderr, actual_logs = self.output.restore_output()
|
| self.assertEqual('', actual_stdout)
|
| self.assertEqual('', actual_stderr)
|
| @@ -49,7 +49,7 @@ class OutputCaptureTest(unittest.TestCase):
|
| def test_initial_log_level(self):
|
| self.output.capture_output()
|
| self.log_all_levels()
|
| - self.assertLogged('INFO\nWARN\nERROR\nCRITICAL\n')
|
| + self.assert_logged('INFO\nWARN\nERROR\nCRITICAL\n')
|
|
|
| def test_set_log_level(self):
|
| self.output.set_log_level(logging.ERROR)
|
| @@ -57,4 +57,4 @@ class OutputCaptureTest(unittest.TestCase):
|
| self.log_all_levels()
|
| self.output.set_log_level(logging.WARN)
|
| self.log_all_levels()
|
| - self.assertLogged('ERROR\nCRITICAL\nWARN\nERROR\nCRITICAL\n')
|
| + self.assert_logged('ERROR\nCRITICAL\nWARN\nERROR\nCRITICAL\n')
|
|
|