LDP
/
python-tldp
mirror of https://github.com/tLDP/python-tldp
0
1
Fork 0
Code Releases Activity

more genericization of testing code

This commit is contained in:
Martin A. Brown 2016-02-16 14:12:42 -08:00
parent 8ae6cf7d69
commit b9defe3e8b
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
tests/tldptesttools.py
View File

@ -12,8 +12,8 @@ def stem_and_ext(name):
return stem, ext
def dir_to_components(reldir):
reldir = os.path.normpath(reldir)
components = list()
reldir, basename = os.path.split(os.path.normpath(reldir))
components = [basename]
while reldir != '':
reldir, basename = os.path.split(reldir)
components.append(basename)
@ -41,13 +41,18 @@ class TestToolsFilesystem(unittest.TestCase):
relpath = os.path.relpath(absdir, self.tempdir)
return relpath, absdir
def addfile(self, dirname, exfile, stem=None, ext=None):
def addfile(self, reldir, filename, content=None, stem=None, ext=None):
if stem is None:
stem, _ = stem_and_ext(exfile.filename)
stem, _ = stem_and_ext(filename)
if ext is None:
_, ext = stem_and_ext(exfile.filename)
newname = os.path.join(dirname, stem + ext)
shutil.copy(exfile.filename, newname)
_, ext = stem_and_ext(filename)
newname = os.path.join(self.tempdir, reldir, stem + ext)
if os.path.isfile(filename):
shutil.copy(filename, newname)
else:
with open(newname) as f:
if content:
f.write(content)
relname = os.path.relpath(newname, self.tempdir)
return relname, newname