Commit 34b1a541 authored by Jim Fulton's avatar Jim Fulton

Fixed stupid bug in rmtree helper and fixed another windows issue.

parent 24b1f8a9
...@@ -543,6 +543,7 @@ def setUp(test): ...@@ -543,6 +543,7 @@ def setUp(test):
for dname in dirs: for dname in dirs:
dname = os.path.join(path, dname) dname = os.path.join(path, dname)
os.rmdir(dname) os.rmdir(dname)
os.rmdir(path)
test.globs['rmtree'] = rmtree test.globs['rmtree'] = rmtree
...@@ -563,6 +564,7 @@ def test_suite(): ...@@ -563,6 +564,7 @@ def test_suite():
setUp=setUp, setUp=setUp,
tearDown=ZODB.tests.util.tearDown, tearDown=ZODB.tests.util.tearDown,
checker = renormalizing.RENormalizing([ checker = renormalizing.RENormalizing([
(re.compile(r'\%(sep)s\%(sep)s' % dict(sep=os.path.sep)), '/'),
(re.compile(r'\%(sep)s' % dict(sep=os.path.sep)), '/'), (re.compile(r'\%(sep)s' % dict(sep=os.path.sep)), '/'),
(re.compile(r'\S+/((old|bushy|lawn)/\S+/foo[23456]?)'), r'\1'), (re.compile(r'\S+/((old|bushy|lawn)/\S+/foo[23456]?)'), r'\1'),
]), ]),
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment