corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 1289949 - Make mozpack.path properly handle paths on mingw python. r=gps

Browse Source 
Mingw python has a different os.path setup from native python, and has
os.sep and os.altsep reversed. In that case, the normsep function was
doing the wrong thing, leading to all sorts of problems.

While fixing this, also ensure the corresponding unit test covers this
peculiarity, even when running under the native win32 python.
This commit is contained in:
Mike Hommey
2016-07-28 18:50:57 +09:00
parent 42c3faa7db
commit ce18ecc89e
2 changed files with 34 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
python/mozbuild/mozpack/test/test_path.py
View File

@@ -21,15 +21,17 @@ import os
class TestPath(unittest.TestCase):
SEP = os.sep
def test_relpath(self):
self.assertEqual(relpath('foo', 'foo'), '')
self.assertEqual(relpath(os.path.join('foo', 'bar'), 'foo/bar'), '')
self.assertEqual(relpath(os.path.join('foo', 'bar'), 'foo'), 'bar')
self.assertEqual(relpath(os.path.join('foo', 'bar', 'baz'), 'foo'),
self.assertEqual(relpath(self.SEP.join(('foo', 'bar')), 'foo/bar'), '')
self.assertEqual(relpath(self.SEP.join(('foo', 'bar')), 'foo'), 'bar')
self.assertEqual(relpath(self.SEP.join(('foo', 'bar', 'baz')), 'foo'),
'bar/baz')
self.assertEqual(relpath(os.path.join('foo', 'bar'), 'foo/bar/baz'),
self.assertEqual(relpath(self.SEP.join(('foo', 'bar')), 'foo/bar/baz'),
'..')
self.assertEqual(relpath(os.path.join('foo', 'bar'), 'foo/baz'),
self.assertEqual(relpath(self.SEP.join(('foo', 'bar')), 'foo/baz'),
'../bar')
self.assertEqual(relpath('foo/', 'foo'), '')
self.assertEqual(relpath('foo/bar/', 'foo'), 'bar')
@@ -41,8 +43,8 @@ class TestPath(unittest.TestCase):
self.assertEqual(join('', 'foo', '/bar'), '/bar')
def test_normpath(self):
self.assertEqual(normpath(os.path.join('foo', 'bar', 'baz',
'..', 'qux')), 'foo/bar/qux')
self.assertEqual(normpath(self.SEP.join(('foo', 'bar', 'baz',
'..', 'qux'))), 'foo/bar/qux')
def test_dirname(self):
self.assertEqual(dirname('foo/bar/baz'), 'foo/bar')
@@ -51,9 +53,9 @@ class TestPath(unittest.TestCase):
self.assertEqual(dirname('foo/bar/'), 'foo/bar')
def test_commonprefix(self):
self.assertEqual(commonprefix([os.path.join('foo', 'bar', 'baz'),
self.assertEqual(commonprefix([self.SEP.join(('foo', 'bar', 'baz')),
'foo/qux', 'foo/baz/qux']), 'foo/')
self.assertEqual(commonprefix([os.path.join('foo', 'bar', 'baz'),
self.assertEqual(commonprefix([self.SEP.join(('foo', 'bar', 'baz')),
'foo/qux', 'baz/qux']), '')
def test_basename(self):
@@ -63,15 +65,15 @@ class TestPath(unittest.TestCase):
self.assertEqual(basename('foo/bar/'), '')
def test_split(self):
self.assertEqual(split(os.path.join('foo', 'bar', 'baz')),
self.assertEqual(split(self.SEP.join(('foo', 'bar', 'baz'))),
['foo', 'bar', 'baz'])
def test_splitext(self):
self.assertEqual(splitext(os.path.join('foo', 'bar', 'baz.qux')),
self.assertEqual(splitext(self.SEP.join(('foo', 'bar', 'baz.qux'))),
('foo/bar/baz', '.qux'))
def test_basedir(self):
foobarbaz = os.path.join('foo', 'bar', 'baz')
foobarbaz = self.SEP.join(('foo', 'bar', 'baz'))
self.assertEqual(basedir(foobarbaz, ['foo', 'bar', 'baz']), 'foo')
self.assertEqual(basedir(foobarbaz, ['foo', 'foo/bar', 'baz']),
'foo/bar')
@@ -119,5 +121,23 @@ class TestPath(unittest.TestCase):
self.assertEqual(rebase('foo', 'foo', 'bar/baz'), 'bar/baz')
self.assertEqual(rebase('foo/bar', 'foo', 'baz'), 'bar/baz')
if os.altsep:
class TestAltPath(TestPath):
SEP = os.altsep
class TestReverseAltPath(TestPath):
def setUp(self):
sep = os.sep
os.sep = os.altsep
os.altsep = sep
def tearDown(self):
self.setUp()
class TestAltReverseAltPath(TestReverseAltPath):
SEP = os.altsep
if __name__ == '__main__':
mozunit.main()