X-Git-Url: https://git.rkrishnan.org/?a=blobdiff_plain;f=src%2Fallmydata%2Ftest%2Ftest_util.py;h=25b656156ee1cec51752e0f29b5a0ef98c7d1eac;hb=498563da69dddae86478343c66d437a467274522;hp=6c67fcc5fda1fdb1250523cd3f8e4891811d46c9;hpb=eb34e0d62574e77ccc49cfd79eea19b89fa5032a;p=tahoe-lafs%2Ftahoe-lafs.git diff --git a/src/allmydata/test/test_util.py b/src/allmydata/test/test_util.py index 6c67fcc5..25b65615 100644 --- a/src/allmydata/test/test_util.py +++ b/src/allmydata/test/test_util.py @@ -15,7 +15,7 @@ from allmydata.util import limiter, time_format, pollmixin, cachedir from allmydata.util import statistics, dictutil, pipeline from allmydata.util import log as tahoe_log from allmydata.util.spans import Spans, overlap, DataSpans -from allmydata.test.common_util import ReallyEqualMixin +from allmydata.test.common_util import ReallyEqualMixin, TimezoneMixin class Base32(unittest.TestCase): @@ -431,18 +431,6 @@ class FileUtil(ReallyEqualMixin, unittest.TestCase): fileutil.write_atomically(fn, "two", mode="") # non-binary self.failUnlessEqual(fileutil.read(fn), "two") - def test_NamedTemporaryDirectory(self): - basedir = "util/FileUtil/test_NamedTemporaryDirectory" - fileutil.make_dirs(basedir) - td = fileutil.NamedTemporaryDirectory(dir=basedir) - name = td.name - self.failUnless(basedir in name) - self.failUnless(basedir in repr(td)) - self.failUnless(os.path.isdir(name)) - del td - # it is conceivable that we need to force gc here, but I'm not sure - self.failIf(os.path.isdir(name)) - def test_rename(self): basedir = "util/FileUtil/test_rename" fileutil.make_dirs(basedir) @@ -488,10 +476,10 @@ class FileUtil(ReallyEqualMixin, unittest.TestCase): # adapted from foo = fileutil.abspath_expanduser_unicode(u"foo") - self.failUnless(foo.endswith(u"\\foo"), foo) + self.failUnless(foo.endswith(u"%sfoo" % (os.path.sep,)), foo) foobar = fileutil.abspath_expanduser_unicode(u"bar", base=foo) - self.failUnless(foobar.endswith(u"\\foo\\bar"), foobar) + self.failUnless(foobar.endswith(u"%sfoo%sbar" % (os.path.sep, os.path.sep)), foobar) if sys.platform == "win32": # This is checking that a drive letter is added for a path without one. @@ -539,10 +527,11 @@ class FileUtil(ReallyEqualMixin, unittest.TestCase): _cleanup() self.failIf(os.path.exists(long_path)) - def test_windows_expanduser(self): + def _test_windows_expanduser(self, userprofile=None, homedrive=None, homepath=None): def call_windows_getenv(name): - if name == u"HOMEDRIVE": return u"C:" - if name == u"HOMEPATH": return u"\\Documents and Settings\\\u0100" + if name == u"USERPROFILE": return userprofile + if name == u"HOMEDRIVE": return homedrive + if name == u"HOMEPATH": return homepath self.fail("unexpected argument to call_windows_getenv") self.patch(fileutil, 'windows_getenv', call_windows_getenv) @@ -553,6 +542,12 @@ class FileUtil(ReallyEqualMixin, unittest.TestCase): self.failUnlessReallyEqual(fileutil.windows_expanduser(u"a~"), u"a~") self.failUnlessReallyEqual(fileutil.windows_expanduser(u"a\\~\\foo"), u"a\\~\\foo") + def test_windows_expanduser_xp(self): + return self._test_windows_expanduser(homedrive=u"C:", homepath=u"\\Documents and Settings\\\u0100") + + def test_windows_expanduser_win7(self): + return self._test_windows_expanduser(userprofile=os.path.join(u"C:", u"\\Documents and Settings\\\u0100")) + def test_disk_stats(self): avail = fileutil.get_available_space('.', 2**14) if avail == 0: @@ -923,7 +918,7 @@ class Limiter(unittest.TestCase): d.addCallback(_all_done) return d -class TimeFormat(unittest.TestCase): +class TimeFormat(unittest.TestCase, TimezoneMixin): def test_epoch(self): return self._help_test_epoch() @@ -937,19 +932,8 @@ class TimeFormat(unittest.TestCase): # time_format.iso_utc_time_to_localseconds() breaks if the timezone is # Europe/London. (As soon as this unit test is done then I'll change # that implementation to something that works even in this case...) - origtz = os.environ.get('TZ') - os.environ['TZ'] = "Europe/London" - if hasattr(time, 'tzset'): - time.tzset() - try: - return self._help_test_epoch() - finally: - if origtz is None: - del os.environ['TZ'] - else: - os.environ['TZ'] = origtz - if hasattr(time, 'tzset'): - time.tzset() + self.setTimezone("Europe/London") + return self._help_test_epoch() def _help_test_epoch(self): origtzname = time.tzname @@ -1011,6 +995,55 @@ class TimeFormat(unittest.TestCase): def test_parse_date(self): self.failUnlessEqual(time_format.parse_date("2010-02-21"), 1266710400) + def test_format_time(self): + self.failUnlessEqual(time_format.format_time(time.gmtime(0)), '1970-01-01 00:00:00') + self.failUnlessEqual(time_format.format_time(time.gmtime(60)), '1970-01-01 00:01:00') + self.failUnlessEqual(time_format.format_time(time.gmtime(60*60)), '1970-01-01 01:00:00') + seconds_per_day = 60*60*24 + leap_years_1970_to_2014_inclusive = ((2012 - 1968) // 4) + self.failUnlessEqual(time_format.format_time(time.gmtime(seconds_per_day*((2015 - 1970)*365+leap_years_1970_to_2014_inclusive))), '2015-01-01 00:00:00') + + def test_format_time_y2038(self): + seconds_per_day = 60*60*24 + leap_years_1970_to_2047_inclusive = ((2044 - 1968) // 4) + self.failUnlessEqual(time_format.format_time(time.gmtime(seconds_per_day*((2048 - 1970)*365+leap_years_1970_to_2047_inclusive))), '2048-01-01 00:00:00') + + test_format_time_y2038.todo = "This test is known to fail on systems with 32-bit time_t." + + def test_format_delta(self): + time_1 = 1389812723 + time_5s_delta = 1389812728 + time_28m7s_delta = 1389814410 + time_1h_delta = 1389816323 + time_1d21h46m49s_delta = 1389977532 + + self.failUnlessEqual( + time_format.format_delta(time_1, time_1), '0s') + + self.failUnlessEqual( + time_format.format_delta(time_1, time_5s_delta), '5s') + self.failUnlessEqual( + time_format.format_delta(time_1, time_28m7s_delta), '28m 7s') + self.failUnlessEqual( + time_format.format_delta(time_1, time_1h_delta), '1h 0m 0s') + self.failUnlessEqual( + time_format.format_delta(time_1, time_1d21h46m49s_delta), '1d 21h 46m 49s') + + self.failUnlessEqual( + time_format.format_delta(time_1d21h46m49s_delta, time_1), '-') + + # time_1 with a decimal fraction will make the delta 1s less + time_1decimal = 1389812723.383963 + + self.failUnlessEqual( + time_format.format_delta(time_1decimal, time_5s_delta), '4s') + self.failUnlessEqual( + time_format.format_delta(time_1decimal, time_28m7s_delta), '28m 6s') + self.failUnlessEqual( + time_format.format_delta(time_1decimal, time_1h_delta), '59m 59s') + self.failUnlessEqual( + time_format.format_delta(time_1decimal, time_1d21h46m49s_delta), '1d 21h 46m 48s') + class CacheDir(unittest.TestCase): def test_basic(self): basedir = "test_util/CacheDir/test_basic"