revert previous commit to fix attribution (vanity)

[tahoe-lafs/tahoe-lafs.git] / src / allmydata / test / test_util.py

diff --git a/src/allmydata/test/test_util.py b/src/allmydata/test/test_util.py
index 5fe2fbd03d9b6367389dba2a9811d96d6653fb77..adaec89f3e55f55210c3a9b4b4fa365d77011883 100644 (file)
--- a/src/allmydata/test/test_util.py
+++ b/src/allmydata/test/test_util.py
@@ -1021,40 +1021,6 @@ class TimeFormat(unittest.TestCase):
 
     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"