bug 1280326 - make MockedOpen case-insensitive on Windows. r=gps
authorTed Mielczarek <ted@mielczarek.org>
Tue, 28 Jun 2016 16:11:33 -0400
changeset 345223 22cfff15c199abe0aef76b306603a4acb8c5eded
parent 345222 b79c51ca296e2679108429029e31f6c84ae1f0d7
child 345224 0edb9df3c97ff7d205a99f8af607f99a858f140b
push id1230
push userjlund@mozilla.com
push dateMon, 31 Oct 2016 18:13:35 +0000
treeherdermozilla-release@5e06e3766db2 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
bug 1280326 - make MockedOpen case-insensitive on Windows. r=gps MozReview-Commit-ID: O26u2kVrSk
--- a/config/mozunit.py
+++ b/config/mozunit.py
@@ -2,16 +2,17 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 from unittest import TextTestRunner as _TestRunner, TestResult as _TestResult
 import unittest
 import inspect
 from StringIO import StringIO
 import os
+import sys
 '''Helper to make python unit tests report the way that the Mozilla
 unit test infrastructure expects tests to report.
 import unittest
 import mozunit
@@ -102,16 +103,27 @@ class MockedFile(StringIO):
     def __enter__(self):
         return self
     def __exit__(self, type, value, traceback):
+def normcase(path):
+    '''
+    Normalize the case of `path`.
+    Don't use `os.path.normcase` because that also normalizes forward slashes
+    to backslashes on Windows.
+    '''
+    if sys.platform.startswith('win'):
+        return path.lower()
+    return path
 class MockedOpen(object):
     Context manager diverting the open builtin such that opening files
     can open "virtual" file instances given when creating a MockedOpen.
     with MockedOpen({'foo': 'foo', 'bar': 'bar'}):
         f = open('foo', 'r')
@@ -124,20 +136,20 @@ class MockedOpen(object):
     with MockedOpen():
         f = open('foo', 'w')
     self.assertRaises(Exception,f.open('foo', 'r'))
     def __init__(self, files = {}):
         self.files = {}
         for name, content in files.iteritems():
-            self.files[os.path.abspath(name)] = content
+            self.files[normcase(os.path.abspath(name))] = content
     def __call__(self, name, mode = 'r'):
-        absname = os.path.abspath(name)
+        absname = normcase(os.path.abspath(name))
         if 'w' in mode:
             file = MockedFile(self, absname)
         elif absname in self.files:
             file = MockedFile(self, absname, self.files[absname])
         elif 'a' in mode:
             file = MockedFile(self, absname, self.open(name, 'r').read())
             file = self.open(name, mode)
@@ -164,26 +176,28 @@ class MockedOpen(object):
         os.path.isfile = self._orig_path_isfile
     def _wrapped_exists(self, p):
         return (self._wrapped_isfile(p) or
                 self._wrapped_isdir(p) or
     def _wrapped_isfile(self, p):
+        p = normcase(p)
         if p in self.files:
             return True
         abspath = os.path.abspath(p)
         if abspath in self.files:
             return True
         return self._orig_path_isfile(p)
     def _wrapped_isdir(self, p):
+        p = normcase(p)
         p = p if p.endswith(('/', '\\')) else p + os.sep
         if any(f.startswith(p) for f in self.files):
             return True
         abspath = os.path.abspath(p) + os.sep
         if any(f.startswith(abspath) for f in self.files):
             return True