ExternalVendorCode/tahoe-lafs
1
0
Fork 0
mirror of https://github.com/tahoe-lafs/tahoe-lafs.git synced 2025-02-05 02:29:44 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix fileutil tests.

Browse Source 
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
This commit is contained in:
Daira Hopwood 2015-10-24 01:14:18 +01:00
parent 2fdc7f2689
commit c9346d2022
2 changed files with 25 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/allmydata/test/test_util.py
View File

@ -568,7 +568,7 @@ class FileUtil(ReallyEqualMixin, unittest.TestCase):
self.failIf(baz_notlong.startswith(u"\\\\?\\"), baz_notlong) self.failIf(baz_notlong.startswith(u"\\\\?\\"), baz_notlong)
self.failUnlessReallyEqual(baz_notlong[1 :], u":\\baz") self.failUnlessReallyEqual(baz_notlong[1 :], u":\\baz")
bar_notlong = fileutil.abspath_expanduser_unicode(u"\\bar", base=baz, long_path=False) bar_notlong = fileutil.abspath_expanduser_unicode(u"\\bar", base=baz_notlong, long_path=False)
self.failIf(bar_notlong.startswith(u"\\\\?\\"), bar_notlong) self.failIf(bar_notlong.startswith(u"\\\\?\\"), bar_notlong)
self.failUnlessReallyEqual(bar_notlong[1 :], u":\\bar") self.failUnlessReallyEqual(bar_notlong[1 :], u":\\bar")
# not u":\\baz\\bar", because \bar is absolute on the current drive. # not u":\\baz\\bar", because \bar is absolute on the current drive.
@ -664,9 +664,9 @@ class FileUtil(ReallyEqualMixin, unittest.TestCase):
self.failUnlessFalse(dirinfo.isfile) self.failUnlessFalse(dirinfo.isfile)
self.failUnlessFalse(dirinfo.islink) self.failUnlessFalse(dirinfo.islink)
# create a file under the directory # create a file
f = os.path.join(basedir, "a", "1.txt") f = os.path.join(basedir, "1.txt")
self.touch(basedir, "a/1.txt", data="a"*10) fileutil.write(f, "a"*10)
fileinfo = fileutil.get_pathinfo(f) fileinfo = fileutil.get_pathinfo(f)
self.failUnlessTrue(fileinfo.isfile) self.failUnlessTrue(fileinfo.isfile)
self.failUnlessTrue(fileinfo.exists) self.failUnlessTrue(fileinfo.exists)
@ -674,17 +674,8 @@ class FileUtil(ReallyEqualMixin, unittest.TestCase):
self.failUnlessFalse(fileinfo.islink) self.failUnlessFalse(fileinfo.islink)
self.failUnlessEqual(fileinfo.size, 10) self.failUnlessEqual(fileinfo.size, 10)
# create a symlink under the directory a pointing to 1.txt
slname = os.path.join(basedir, "a", "linkto1.txt")
os.symlink(f, slname)
symlinkinfo = fileutil.get_pathinfo(slname)
self.failUnlessTrue(symlinkinfo.islink)
self.failUnlessTrue(symlinkinfo.exists)
self.failUnlessFalse(symlinkinfo.isfile)
self.failUnlessFalse(symlinkinfo.isdir)
# path at which nothing exists # path at which nothing exists
dnename = os.path.join(basedir, "a", "doesnotexist") dnename = os.path.join(basedir, "doesnotexist")
now = time.time() now = time.time()
dneinfo = fileutil.get_pathinfo(dnename, now=now) dneinfo = fileutil.get_pathinfo(dnename, now=now)
self.failUnlessFalse(dneinfo.exists) self.failUnlessFalse(dneinfo.exists)
@ -695,6 +686,25 @@ class FileUtil(ReallyEqualMixin, unittest.TestCase):
self.failUnlessEqual(dneinfo.mtime, now) self.failUnlessEqual(dneinfo.mtime, now)
self.failUnlessEqual(dneinfo.ctime, now) self.failUnlessEqual(dneinfo.ctime, now)
def test_get_pathinfo_symlink(self):
if not hasattr(os, 'symlink'):
raise unittest.SkipTest("can't create symlinks on this platform")
basedir = "util/FileUtil/test_get_pathinfo"
fileutil.make_dirs(basedir)
f = os.path.join(basedir, "1.txt")
fileutil.write(f, "a"*10)
# create a symlink pointing to 1.txt
slname = os.path.join(basedir, "linkto1.txt")
os.symlink(f, slname)
symlinkinfo = fileutil.get_pathinfo(slname)
self.failUnlessTrue(symlinkinfo.islink)
self.failUnlessTrue(symlinkinfo.exists)
self.failUnlessFalse(symlinkinfo.isfile)
self.failUnlessFalse(symlinkinfo.isdir)
class PollMixinTests(unittest.TestCase): class PollMixinTests(unittest.TestCase):
def setUp(self): def setUp(self):

2
src/allmydata/util/fileutil.py
View File

@ -287,7 +287,7 @@ def abspath_expanduser_unicode(path, base=None, long_path=True):
""" """
if not isinstance(path, unicode): if not isinstance(path, unicode):
raise AssertionError("paths must be Unicode strings") raise AssertionError("paths must be Unicode strings")
if base is not None: if base is not None and long_path:
precondition_abspath(base) precondition_abspath(base)
path = expanduser(path) path = expanduser(path)