| Index: third_party/WebKit/Tools/Scripts/webkitpy/common/system/path_unittest.py
|
| diff --git a/third_party/WebKit/Tools/Scripts/webkitpy/common/system/path_unittest.py b/third_party/WebKit/Tools/Scripts/webkitpy/common/system/path_unittest.py
|
| index 38094f76fb8d6f4171f6eb8ac09aa2506f881d8a..f2fe6377efc518d7dd1d2581aca690ca682e9a7b 100644
|
| --- a/third_party/WebKit/Tools/Scripts/webkitpy/common/system/path_unittest.py
|
| +++ b/third_party/WebKit/Tools/Scripts/webkitpy/common/system/path_unittest.py
|
| @@ -29,20 +29,20 @@
|
| import sys
|
| import unittest
|
|
|
| -from webkitpy.common.system.systemhost import SystemHost
|
| -from webkitpy.common.system.platforminfo_mock import MockPlatformInfo
|
| +from webkitpy.common.system.system_host import SystemHost
|
| +from webkitpy.common.system.platform_info_mock import MockPlatformInfo
|
| from webkitpy.common.system import path
|
|
|
|
|
| class AbspathTest(unittest.TestCase):
|
|
|
| - def platforminfo(self):
|
| + def platform_info(self):
|
| return SystemHost().platform
|
|
|
| def test_abspath_to_uri_cygwin(self):
|
| if sys.platform != 'cygwin':
|
| return
|
| - self.assertEqual(path.abspath_to_uri(self.platforminfo(), '/cygdrive/c/foo/bar.html'),
|
| + self.assertEqual(path.abspath_to_uri(self.platform_info(), '/cygdrive/c/foo/bar.html'),
|
| 'file:///C:/foo/bar.html')
|
|
|
| def test_abspath_to_uri_unixy(self):
|
| @@ -52,7 +52,7 @@ class AbspathTest(unittest.TestCase):
|
| def test_abspath_to_uri_win(self):
|
| if sys.platform != 'win32':
|
| return
|
| - self.assertEqual(path.abspath_to_uri(self.platforminfo(), 'c:\\foo\\bar.html'),
|
| + self.assertEqual(path.abspath_to_uri(self.platform_info(), 'c:\\foo\\bar.html'),
|
| 'file:///c:/foo/bar.html')
|
|
|
| def test_abspath_to_uri_escaping_unixy(self):
|
| @@ -63,7 +63,7 @@ class AbspathTest(unittest.TestCase):
|
| def test_abspath_to_uri_escaping_cygwin(self):
|
| if sys.platform != 'cygwin':
|
| return
|
| - self.assertEqual(path.abspath_to_uri(self.platforminfo(), '/cygdrive/c/foo/bar + baz%.html'),
|
| + self.assertEqual(path.abspath_to_uri(self.platform_info(), '/cygdrive/c/foo/bar + baz%.html'),
|
| 'file:///C:/foo/bar%20+%20baz%25.html')
|
|
|
| def test_stop_cygpath_subprocess(self):
|
|
|