[SCM] WebKit Debian packaging branch, webkit-1.3, updated. upstream/1.3.7-4207-g178b198

[dpranke at chromium.org]

The following commit has been merged in the webkit-1.3 branch:
commit c6606872b7d85e4da9df5c0dfe44eeabe44fec64
Author: dpranke at chromium.org <dpranke at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Jan 21 02:30:55 2011 +0000

    2011-01-20  Dirk Pranke  <dpranke at chromium.org>
    
            Reviewed by Eric Seidel.
    
            nrwt: rewrite google_chrome_unittest to use mock filesystem.
    
            https://bugs.webkit.org/show_bug.cgi?id=52772
    
            * Scripts/webkitpy/layout_tests/port/google_chrome_unittest.py:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@76323 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index 3e05266..3549991 100644
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,5 +1,15 @@
 2011-01-20  Dirk Pranke  <dpranke at chromium.org>
 
+        Reviewed by Eric Seidel.
+
+        nrwt: rewrite google_chrome_unittest to use mock filesystem.
+        
+        https://bugs.webkit.org/show_bug.cgi?id=52772
+        
+        * Scripts/webkitpy/layout_tests/port/google_chrome_unittest.py:
+
+2011-01-20  Dirk Pranke  <dpranke at chromium.org>
+
         Reviewed by Eric Siedel.
 
         nrwt: clean up almost all remaining port references, remove
diff --git a/Tools/Scripts/webkitpy/layout_tests/port/google_chrome_unittest.py b/Tools/Scripts/webkitpy/layout_tests/port/google_chrome_unittest.py
index 6539bb2..aab8dd1 100644
--- a/Tools/Scripts/webkitpy/layout_tests/port/google_chrome_unittest.py
+++ b/Tools/Scripts/webkitpy/layout_tests/port/google_chrome_unittest.py
@@ -24,11 +24,9 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-import codecs
-import os
 import unittest
 
-from webkitpy.common import newstringio
+from webkitpy.common.system import filesystem_mock
 
 import factory
 import google_chrome
@@ -58,45 +56,27 @@ class GetGoogleChromePortTest(unittest.TestCase):
         # be able to control the contents better.
 
         chromium_port = factory.get("chromium-mac")
-        chromium_overrides = chromium_port.test_expectations_overrides()
+        chromium_base = chromium_port.path_from_chromium_base()
+        fs = filesystem_mock.MockFileSystem()
         port = google_chrome.GetGoogleChromePort(port_name=port_name,
-                                                 options=None)
-
-        orig_exists = os.path.exists
-        orig_open = codecs.open
-        expected_string = "// hello, world\n"
-
-        def mock_exists_chrome_not_found(path):
-            if 'test_expectations_chrome.txt' in path:
-                return False
-            return orig_exists(path)
-
-        def mock_exists_chrome_found(path):
-            if 'test_expectations_chrome.txt' in path:
-                return True
-            return orig_exists(path)
-
-        def mock_open(path, mode, encoding):
-            if 'test_expectations_chrome.txt' in path:
-                return newstringio.StringIO(expected_string)
-            return orig_open(path, mode, encoding)
-
-        try:
-            os.path.exists = mock_exists_chrome_not_found
-            chrome_overrides = port.test_expectations_overrides()
-            self.assertEqual(chromium_overrides, chrome_overrides)
-
-            os.path.exists = mock_exists_chrome_found
-            codecs.open = mock_open
-            chrome_overrides = port.test_expectations_overrides()
-            if chromium_overrides:
-                self.assertEqual(chrome_overrides,
-                                 chromium_overrides + expected_string)
-            else:
-                self.assertEqual(chrome_overrides, expected_string)
-        finally:
-            os.path.exists = orig_exists
-            codecs.open = orig_open
+                                                 options=None, filesystem=fs)
+
+        expected_chromium_overrides = '// chromium overrides\n'
+        expected_chrome_overrides = '// chrome overrides\n'
+        chromium_path = fs.join(chromium_base, 'webkit', 'tools',
+                                'layout_tests', 'test_expectations.txt')
+        chrome_path = fs.join(chromium_base, 'webkit', 'tools',
+                              'layout_tests', 'test_expectations_chrome.txt')
+
+        fs.files[chromium_path] = expected_chromium_overrides
+        fs.files[chrome_path] = None
+        actual_chrome_overrides = port.test_expectations_overrides()
+        self.assertEqual(expected_chromium_overrides, actual_chrome_overrides)
+
+        fs.files[chrome_path] = expected_chrome_overrides
+        actual_chrome_overrides = port.test_expectations_overrides()
+        self.assertEqual(actual_chrome_overrides,
+                         expected_chromium_overrides + expected_chrome_overrides)
 
 
 if __name__ == '__main__':

-- 
WebKit Debian packaging