traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix packaging tests on Windows: use os.path.join() in glob patterns

This commit is contained in:
Victor Stinner 2011-05-20 00:33:39 +02:00
parent 21809a6938
commit e1e3b12979
2 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Lib/packaging/tests/test_resources.py
View File

@ -58,7 +58,7 @@ class DataFilesTestCase(GlobTestCaseBase):
def test_set_match_exclude(self):
rules = [('scripts', '*', '{appscript}'),
('', '**/*.sh', None)]
('', os.path.join('**', '*.sh'), None)]
spec = {'scripts/scripts.bin': '{appscript}/scripts.bin',
'scripts/script.sh': None,
'Babarlikestrawberry': None}
@ -73,7 +73,7 @@ class DataFilesTestCase(GlobTestCaseBase):
self.assertRulesMatch(rules, spec)
def test_recursive_glob(self):
rules = [('', '**/*.bin', '{binary}')]
rules = [('', os.path.join('**', '*.bin'), '{binary}')]
spec = {'binary0.bin': '{binary}/binary0.bin',
'scripts/binary1.bin': '{binary}/scripts/binary1.bin',
'scripts/bin/binary2.bin': '{binary}/scripts/bin/binary2.bin',
@ -83,12 +83,12 @@ class DataFilesTestCase(GlobTestCaseBase):
def test_final_exemple_glob(self):
rules = [
('mailman/database/schemas/', '*', '{appdata}/schemas'),
('', '**/*.tpl', '{appdata}/templates'),
('', 'developer-docs/**/*.txt', '{doc}'),
('', os.path.join('**', '*.tpl'), '{appdata}/templates'),
('', os.path.join('developer-docs', '**', '*.txt'), '{doc}'),
('', 'README', '{doc}'),
('mailman/etc/', '*', '{config}'),
('mailman/foo/', '**/bar/*.cfg', '{config}/baz'),
('mailman/foo/', '**/*.cfg', '{config}/hmm'),
('mailman/foo/', os.path.join('**', 'bar', '*.cfg'), '{config}/baz'),
('mailman/foo/', os.path.join('**', '*.cfg'), '{config}/hmm'),
('', 'some-new-semantic.sns', '{funky-crazy-category}'),
]
spec = {

18
Lib/packaging/tests/test_util.py
View File

@ -542,7 +542,7 @@ class GlobTestCase(GlobTestCaseBase):
self.assertGlobMatch(glob, spec)
def test_simple_glob_in_dir(self):
glob = 'babar/*.tp?'
glob = os.path.join('babar', '*.tp?')
spec = {'babar/coucou.tpl': True,
'babar/coucou.tpj': True,
'babar/toto.bin': False,
@ -550,7 +550,7 @@ class GlobTestCase(GlobTestCaseBase):
self.assertGlobMatch(glob, spec)
def test_recursive_glob_head(self):
glob = '**/tip/*.t?l'
glob = os.path.join('**', 'tip', '*.t?l')
spec = {'babar/zaza/zuzu/tip/coucou.tpl': True,
'babar/z/tip/coucou.tpl': True,
'babar/tip/coucou.tpl': True,
@ -563,7 +563,7 @@ class GlobTestCase(GlobTestCaseBase):
self.assertGlobMatch(glob, spec)
def test_recursive_glob_tail(self):
glob = 'babar/**'
glob = os.path.join('babar', '**')
spec = {'babar/zaza/': True,
'babar/zaza/zuzu/': True,
'babar/zaza/zuzu/babar.xml': True,
@ -577,7 +577,7 @@ class GlobTestCase(GlobTestCaseBase):
self.assertGlobMatch(glob, spec)
def test_recursive_glob_middle(self):
glob = 'babar/**/tip/*.t?l'
glob = os.path.join('babar', '**', 'tip', '*.t?l')
spec = {'babar/zaza/zuzu/tip/coucou.tpl': True,
'babar/z/tip/coucou.tpl': True,
'babar/tip/coucou.tpl': True,
@ -590,7 +590,7 @@ class GlobTestCase(GlobTestCaseBase):
self.assertGlobMatch(glob, spec)
def test_glob_set_tail(self):
glob = 'bin/*.{bin,sh,exe}'
glob = os.path.join('bin', '*.{bin,sh,exe}')
spec = {'bin/babar.bin': True,
'bin/zephir.sh': True,
'bin/celestine.exe': True,
@ -601,7 +601,7 @@ class GlobTestCase(GlobTestCaseBase):
self.assertGlobMatch(glob, spec)
def test_glob_set_middle(self):
glob = 'xml/{babar,toto}.xml'
glob = os.path.join('xml', '{babar,toto}.xml')
spec = {'xml/babar.xml': True,
'xml/toto.xml': True,
'xml/babar.xslt': False,
@ -612,7 +612,7 @@ class GlobTestCase(GlobTestCaseBase):
self.assertGlobMatch(glob, spec)
def test_glob_set_head(self):
glob = '{xml,xslt}/babar.*'
glob = os.path.join('{xml,xslt}', 'babar.*')
spec = {'xml/babar.xml': True,
'xml/toto.xml': False,
'xslt/babar.xslt': True,
@ -622,7 +622,9 @@ class GlobTestCase(GlobTestCaseBase):
self.assertGlobMatch(glob, spec)
def test_glob_all(self):
glob = '{xml/*,xslt/**}/babar.xml'
dirs = '{%s,%s}' % (os.path.join('xml', '*'),
os.path.join('xslt', '**'))
glob = os.path.join(dirs, 'babar.xml')
spec = {'xml/a/babar.xml': True,
'xml/b/babar.xml': True,
'xml/a/c/babar.xml': False,