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

util/time_format.py: accept space separator, add unit tests

Browse Source
This commit is contained in:
Brian Warner 2008-10-13 15:52:58 -07:00
parent 46657b797f
commit b0a00e0f33
2 changed files with 27 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,14 +1,14 @@
def foo(): pass # keep the line number constant def foo(): pass # keep the line number constant
import os import os, time
from twisted.trial import unittest from twisted.trial import unittest
from twisted.internet import defer, reactor from twisted.internet import defer, reactor
from twisted.python import failure from twisted.python import failure
from allmydata.util import base32, idlib, humanreadable, mathutil, hashutil from allmydata.util import base32, idlib, humanreadable, mathutil, hashutil
from allmydata.util import assertutil, fileutil, testutil, deferredutil from allmydata.util import assertutil, fileutil, testutil, deferredutil
from allmydata.util import limiter from allmydata.util import limiter, time_format
class Base32(unittest.TestCase): class Base32(unittest.TestCase):
def test_b2a_matches_Pythons(self): def test_b2a_matches_Pythons(self):
@ -517,3 +517,27 @@ class Limiter(unittest.TestCase):
self.failUnless( (i, str(i)) in self.calls) self.failUnless( (i, str(i)) in self.calls)
d.addCallback(_all_done) d.addCallback(_all_done)
return d return d
class TimeFormat(unittest.TestCase):
def test_epoch(self):
s = time_format.iso_utc_time_to_localseconds("1970-01-01T00:00:01")
self.failUnlessEqual(s, 1.0)
s = time_format.iso_utc_time_to_localseconds("1970-01-01_00:00:01")
self.failUnlessEqual(s, 1.0)
s = time_format.iso_utc_time_to_localseconds("1970-01-01 00:00:01")
self.failUnlessEqual(s, 1.0)
self.failUnlessEqual(time_format.iso_utc(1.0), "1970-01-01_00:00:01")
self.failUnlessEqual(time_format.iso_utc(1.0, sep=" "),
"1970-01-01 00:00:01")
now = time.time()
def my_time():
return 1.0
self.failUnlessEqual(time_format.iso_utc(t=my_time),
"1970-01-01_00:00:01")
e = self.failUnlessRaises(ValueError,
time_format.iso_utc_time_to_localseconds,
"invalid timestring")
self.failUnless("not a complete ISO8601 timestamp" in str(e))
s = time_format.iso_utc_time_to_localseconds("1970-01-01_00:00:01.500")
self.failUnlessEqual(s, 1.5)

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

@ -14,7 +14,7 @@ def iso_utc(now=None, sep='_', t=time.time):
now = t() now = t()
return datetime.datetime.utcfromtimestamp(now).isoformat(sep) return datetime.datetime.utcfromtimestamp(now).isoformat(sep)
def iso_utc_time_to_localseconds(isotime, _conversion_re=re.compile(r"(?P<year>\d{4})-(?P<month>\d{2})-(?P<day>\d{2})[T_](?P<hour>\d{2}):(?P<minute>\d{2}):(?P<second>\d{2})(?P<subsecond>\.\d+)?")): def iso_utc_time_to_localseconds(isotime, _conversion_re=re.compile(r"(?P<year>\d{4})-(?P<month>\d{2})-(?P<day>\d{2})[T_ ](?P<hour>\d{2}):(?P<minute>\d{2}):(?P<second>\d{2})(?P<subsecond>\.\d+)?")):
""" """
The inverse of iso_utc(). The inverse of iso_utc().