[Python-checkins] python/dist/src/Lib/test test_glob.py,1.9,1.10
jlgijsbers at users.sourceforge.net
jlgijsbers at users.sourceforge.net
Sat Jan 8 14:28:56 CET 2005
Update of /cvsroot/python/python/dist/src/Lib/test
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11756
Modified Files:
test_glob.py
Log Message:
Clean up tests by reusing functions from other modules:
* replace deltree with shutil.rmtree()
* replace mkdirs with os.makedirs()
* fold touchfile into GlobTests.mktemp()
Index: test_glob.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_glob.py,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- test_glob.py 8 Jan 2005 13:13:19 -0000 1.9
+++ test_glob.py 8 Jan 2005 13:28:54 -0000 1.10
@@ -2,35 +2,7 @@
from test.test_support import run_unittest, TESTFN
import glob
import os
-
-def mkdirs(fname):
- if os.path.exists(fname) or fname == '':
- return
- base, file = os.path.split(fname)
- mkdirs(base)
- os.mkdir(fname)
-
-def touchfile(fname):
- base, file = os.path.split(fname)
- mkdirs(base)
- f = open(fname, 'w')
- f.close()
-
-def deltree(fname):
- for f in os.listdir(fname):
- fullname = os.path.join(fname, f)
- if os.path.isdir(fullname):
- deltree(fullname)
- else:
- try:
- os.unlink(fullname)
- except:
- pass
- try:
- os.rmdir(fname)
- except:
- pass
-
+import shutil
class GlobTests(unittest.TestCase):
@@ -38,7 +10,12 @@
return os.path.normpath(os.path.join(self.tempdir, *parts))
def mktemp(self, *parts):
- touchfile(self.norm(*parts))
+ filename = self.norm(*parts)
+ base, file = os.path.split(filename)
+ if not os.path.exists(base):
+ os.makedirs(base)
+ f = open(filename, 'w')
+ f.close()
def setUp(self):
self.tempdir = TESTFN+"_dir"
@@ -53,7 +30,7 @@
os.symlink(self.norm('broken'), self.norm('sym2'))
def tearDown(self):
- deltree(self.tempdir)
+ shutil.rmtree(self.tempdir)
def glob(self, *parts):
if len(parts) == 1:
More information about the Python-checkins
mailing list