diff options
| author | Russell Brenner <russellbrenner@google.com> | 2010-11-18 17:33:13 -0800 |
|---|---|---|
| committer | Russell Brenner <russellbrenner@google.com> | 2010-12-02 13:47:21 -0800 |
| commit | 6b70adc33054f8aee8c54d0f460458a9df11b8a5 (patch) | |
| tree | 103a13998c33944d6ab3b8318c509a037e639460 /WebKitTools/Scripts/webkitpy/layout_tests/port/google_chrome_unittest.py | |
| parent | bdf4ebc8e70b2d221b6ee7a65660918ecb1d33aa (diff) | |
| download | external_webkit-6b70adc33054f8aee8c54d0f460458a9df11b8a5.zip external_webkit-6b70adc33054f8aee8c54d0f460458a9df11b8a5.tar.gz external_webkit-6b70adc33054f8aee8c54d0f460458a9df11b8a5.tar.bz2 | |
Merge WebKit at r72274: Initial merge by git.
Change-Id: Ie51f0b4a16da82942bd516dce59cfb79ebbe25fb
Diffstat (limited to 'WebKitTools/Scripts/webkitpy/layout_tests/port/google_chrome_unittest.py')
| -rw-r--r-- | WebKitTools/Scripts/webkitpy/layout_tests/port/google_chrome_unittest.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/WebKitTools/Scripts/webkitpy/layout_tests/port/google_chrome_unittest.py b/WebKitTools/Scripts/webkitpy/layout_tests/port/google_chrome_unittest.py index c4c885d..e60c274 100644 --- a/WebKitTools/Scripts/webkitpy/layout_tests/port/google_chrome_unittest.py +++ b/WebKitTools/Scripts/webkitpy/layout_tests/port/google_chrome_unittest.py @@ -28,7 +28,8 @@ import codecs import os import unittest -import base_unittest +from webkitpy.common import newstringio + import factory import google_chrome @@ -77,7 +78,7 @@ class GetGoogleChromePortTest(unittest.TestCase): def mock_open(path, mode, encoding): if 'test_expectations_chrome.txt' in path: - return base_unittest.NewStringIO(expected_string) + return newstringio.StringIO(expected_string) return orig_open(path, mode, encoding) try: |