Index: third_party/WebKit/Tools/Scripts/webkitpy/style/main_unittest.py |
diff --git a/third_party/WebKit/Tools/Scripts/webkitpy/style/main_unittest.py b/third_party/WebKit/Tools/Scripts/webkitpy/style/main_unittest.py |
index c2c0434b99aa651a88d8aec8566bbf7bfc0dc4dd..b97969124c3b93682682c7daace90833a429001e 100644 |
--- a/third_party/WebKit/Tools/Scripts/webkitpy/style/main_unittest.py |
+++ b/third_party/WebKit/Tools/Scripts/webkitpy/style/main_unittest.py |
@@ -24,27 +24,24 @@ import unittest |
from main import change_directory |
from webkitpy.common.system.filesystem_mock import MockFileSystem |
-from webkitpy.common.system.logtesting import LogTesting |
+from webkitpy.common.system.logtesting import LoggingTestCase |
-class ChangeDirectoryTest(unittest.TestCase): |
+class ChangeDirectoryTest(LoggingTestCase): |
_original_directory = "/original" |
_checkout_root = "/WebKit" |
def setUp(self): |
- self._log = LogTesting.setUp(self) |
+ super(ChangeDirectoryTest, self).setUp() |
self.filesystem = MockFileSystem(dirs=[self._original_directory, self._checkout_root], cwd=self._original_directory) |
- def tearDown(self): |
- self._log.tearDown() |
- |
def _change_directory(self, paths, checkout_root): |
return change_directory(self.filesystem, paths=paths, checkout_root=checkout_root) |
def _assert_result(self, actual_return_value, expected_return_value, |
expected_log_messages, expected_current_directory): |
self.assertEqual(actual_return_value, expected_return_value) |
- self._log.assertMessages(expected_log_messages) |
+ self.assertLog(expected_log_messages) |
self.assertEqual(self.filesystem.getcwd(), expected_current_directory) |
def test_paths_none(self): |