X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=lib%2Fbup%2Ft%2Ftxstat.py;h=64bad2de0eed71d0e8776dabe1831e5e1e9d3247;hb=c40b3dd5fd74e72024fbaad3daf5a958aefa1c54;hp=412e71d22795954d2a4e67fb72300c9bfbad0d55;hpb=85982e45546486479d09d0409d0c70b7b73a1013;p=bup.git

diff --git a/lib/bup/t/txstat.py b/lib/bup/t/txstat.py
index 412e71d..64bad2d 100644
--- a/lib/bup/t/txstat.py
+++ b/lib/bup/t/txstat.py
@@ -1,116 +1,117 @@
+
+from __future__ import absolute_import
 import math, tempfile, subprocess
+
 from wvtest import *
+
 import bup._helpers as _helpers
 from bup import xstat
+from buptest import no_lingering_errors, test_tempdir
+
 
 @wvtest
 def test_fstime():
-    WVPASSEQ(xstat.timespec_to_nsecs((0, 0)), 0)
-    WVPASSEQ(xstat.timespec_to_nsecs((1, 0)), 10**9)
-    WVPASSEQ(xstat.timespec_to_nsecs((0, 10**9 / 2)), 500000000)
-    WVPASSEQ(xstat.timespec_to_nsecs((1, 10**9 / 2)), 1500000000)
-    WVPASSEQ(xstat.timespec_to_nsecs((-1, 0)), -10**9)
-    WVPASSEQ(xstat.timespec_to_nsecs((-1, 10**9 / 2)), -500000000)
-    WVPASSEQ(xstat.timespec_to_nsecs((-2, 10**9 / 2)), -1500000000)
-    WVPASSEQ(xstat.timespec_to_nsecs((0, -1)), -1)
-    WVPASSEQ(type(xstat.timespec_to_nsecs((2, 22222222))), type(0))
-    WVPASSEQ(type(xstat.timespec_to_nsecs((-2, 22222222))), type(0))
+    with no_lingering_errors():
+        WVPASSEQ(xstat.timespec_to_nsecs((0, 0)), 0)
+        WVPASSEQ(xstat.timespec_to_nsecs((1, 0)), 10**9)
+        WVPASSEQ(xstat.timespec_to_nsecs((0, 10**9 / 2)), 500000000)
+        WVPASSEQ(xstat.timespec_to_nsecs((1, 10**9 / 2)), 1500000000)
+        WVPASSEQ(xstat.timespec_to_nsecs((-1, 0)), -10**9)
+        WVPASSEQ(xstat.timespec_to_nsecs((-1, 10**9 / 2)), -500000000)
+        WVPASSEQ(xstat.timespec_to_nsecs((-2, 10**9 / 2)), -1500000000)
+        WVPASSEQ(xstat.timespec_to_nsecs((0, -1)), -1)
+        WVPASSEQ(type(xstat.timespec_to_nsecs((2, 22222222))), type(0))
+        WVPASSEQ(type(xstat.timespec_to_nsecs((-2, 22222222))), type(0))
 
-    WVPASSEQ(xstat.nsecs_to_timespec(0), (0, 0))
-    WVPASSEQ(xstat.nsecs_to_timespec(10**9), (1, 0))
-    WVPASSEQ(xstat.nsecs_to_timespec(500000000), (0, 10**9 / 2))
-    WVPASSEQ(xstat.nsecs_to_timespec(1500000000), (1, 10**9 / 2))
-    WVPASSEQ(xstat.nsecs_to_timespec(-10**9), (-1, 0))
-    WVPASSEQ(xstat.nsecs_to_timespec(-500000000), (-1, 10**9 / 2))
-    WVPASSEQ(xstat.nsecs_to_timespec(-1500000000), (-2, 10**9 / 2))
-    x = xstat.nsecs_to_timespec(1977777778)
-    WVPASSEQ(type(x[0]), type(0))
-    WVPASSEQ(type(x[1]), type(0))
-    x = xstat.nsecs_to_timespec(-1977777778)
-    WVPASSEQ(type(x[0]), type(0))
-    WVPASSEQ(type(x[1]), type(0))
+        WVPASSEQ(xstat.nsecs_to_timespec(0), (0, 0))
+        WVPASSEQ(xstat.nsecs_to_timespec(10**9), (1, 0))
+        WVPASSEQ(xstat.nsecs_to_timespec(500000000), (0, 10**9 / 2))
+        WVPASSEQ(xstat.nsecs_to_timespec(1500000000), (1, 10**9 / 2))
+        WVPASSEQ(xstat.nsecs_to_timespec(-10**9), (-1, 0))
+        WVPASSEQ(xstat.nsecs_to_timespec(-500000000), (-1, 10**9 / 2))
+        WVPASSEQ(xstat.nsecs_to_timespec(-1500000000), (-2, 10**9 / 2))
+        x = xstat.nsecs_to_timespec(1977777778)
+        WVPASSEQ(type(x[0]), type(0))
+        WVPASSEQ(type(x[1]), type(0))
+        x = xstat.nsecs_to_timespec(-1977777778)
+        WVPASSEQ(type(x[0]), type(0))
+        WVPASSEQ(type(x[1]), type(0))
 
-    WVPASSEQ(xstat.nsecs_to_timeval(0), (0, 0))
-    WVPASSEQ(xstat.nsecs_to_timeval(10**9), (1, 0))
-    WVPASSEQ(xstat.nsecs_to_timeval(500000000), (0, (10**9 / 2) / 1000))
-    WVPASSEQ(xstat.nsecs_to_timeval(1500000000), (1, (10**9 / 2) / 1000))
-    WVPASSEQ(xstat.nsecs_to_timeval(-10**9), (-1, 0))
-    WVPASSEQ(xstat.nsecs_to_timeval(-500000000), (-1, (10**9 / 2) / 1000))
-    WVPASSEQ(xstat.nsecs_to_timeval(-1500000000), (-2, (10**9 / 2) / 1000))
-    x = xstat.nsecs_to_timeval(1977777778)
-    WVPASSEQ(type(x[0]), type(0))
-    WVPASSEQ(type(x[1]), type(0))
-    x = xstat.nsecs_to_timeval(-1977777778)
-    WVPASSEQ(type(x[0]), type(0))
-    WVPASSEQ(type(x[1]), type(0))
+        WVPASSEQ(xstat.nsecs_to_timeval(0), (0, 0))
+        WVPASSEQ(xstat.nsecs_to_timeval(10**9), (1, 0))
+        WVPASSEQ(xstat.nsecs_to_timeval(500000000), (0, (10**9 / 2) / 1000))
+        WVPASSEQ(xstat.nsecs_to_timeval(1500000000), (1, (10**9 / 2) / 1000))
+        WVPASSEQ(xstat.nsecs_to_timeval(-10**9), (-1, 0))
+        WVPASSEQ(xstat.nsecs_to_timeval(-500000000), (-1, (10**9 / 2) / 1000))
+        WVPASSEQ(xstat.nsecs_to_timeval(-1500000000), (-2, (10**9 / 2) / 1000))
+        x = xstat.nsecs_to_timeval(1977777778)
+        WVPASSEQ(type(x[0]), type(0))
+        WVPASSEQ(type(x[1]), type(0))
+        x = xstat.nsecs_to_timeval(-1977777778)
+        WVPASSEQ(type(x[0]), type(0))
+        WVPASSEQ(type(x[1]), type(0))
 
-    WVPASSEQ(xstat.fstime_floor_secs(0), 0)
-    WVPASSEQ(xstat.fstime_floor_secs(10**9 / 2), 0)
-    WVPASSEQ(xstat.fstime_floor_secs(10**9), 1)
-    WVPASSEQ(xstat.fstime_floor_secs(-10**9 / 2), -1)
-    WVPASSEQ(xstat.fstime_floor_secs(-10**9), -1)
-    WVPASSEQ(type(xstat.fstime_floor_secs(10**9 / 2)), type(0))
-    WVPASSEQ(type(xstat.fstime_floor_secs(-10**9 / 2)), type(0))
+        WVPASSEQ(xstat.fstime_floor_secs(0), 0)
+        WVPASSEQ(xstat.fstime_floor_secs(10**9 / 2), 0)
+        WVPASSEQ(xstat.fstime_floor_secs(10**9), 1)
+        WVPASSEQ(xstat.fstime_floor_secs(-10**9 / 2), -1)
+        WVPASSEQ(xstat.fstime_floor_secs(-10**9), -1)
+        WVPASSEQ(type(xstat.fstime_floor_secs(10**9 / 2)), type(0))
+        WVPASSEQ(type(xstat.fstime_floor_secs(-10**9 / 2)), type(0))
 
 
 @wvtest
 def test_bup_utimensat():
     if not xstat._bup_utimensat:
         return
-    tmpdir = tempfile.mkdtemp(prefix='bup-tmetadata-')
-    try:
-        path = tmpdir + '/foo'
-        open(path, 'w').close()
-        frac_ts = (0, 10**9 / 2)
-        xstat._bup_utimensat(_helpers.AT_FDCWD, path, (frac_ts, frac_ts), 0)
-        st = _helpers.stat(path)
-        atime_ts = st[8]
-        mtime_ts = st[9]
-        WVPASSEQ(atime_ts[0], 0)
-        WVPASS(atime_ts[1] == 0 or atime_ts[1] == frac_ts[1])
-        WVPASSEQ(mtime_ts[0], 0)
-        WVPASS(mtime_ts[1] == 0 or mtime_ts[1] == frac_ts[1])
-    finally:
-        subprocess.call(['rm', '-rf', tmpdir])
+    with no_lingering_errors():
+        with test_tempdir('bup-txstat-') as tmpdir:
+            path = tmpdir + '/foo'
+            open(path, 'w').close()
+            frac_ts = (0, 10**9 / 2)
+            xstat._bup_utimensat(_helpers.AT_FDCWD, path, (frac_ts, frac_ts), 0)
+            st = _helpers.stat(path)
+            atime_ts = st[8]
+            mtime_ts = st[9]
+            WVPASSEQ(atime_ts[0], 0)
+            WVPASS(atime_ts[1] == 0 or atime_ts[1] == frac_ts[1])
+            WVPASSEQ(mtime_ts[0], 0)
+            WVPASS(mtime_ts[1] == 0 or mtime_ts[1] == frac_ts[1])
 
 
 @wvtest
 def test_bup_utimes():
     if not xstat._bup_utimes:
         return
-    tmpdir = tempfile.mkdtemp(prefix='bup-tmetadata-')
-    try:
-        path = tmpdir + '/foo'
-        open(path, 'w').close()
-        frac_ts = (0, 10**6 / 2)
-        xstat._bup_utimes(path, (frac_ts, frac_ts))
-        st = _helpers.stat(path)
-        atime_ts = st[8]
-        mtime_ts = st[9]
-        WVPASSEQ(atime_ts[0], 0)
-        WVPASS(atime_ts[1] == 0 or atime_ts[1] == frac_ts[1] * 1000)
-        WVPASSEQ(mtime_ts[0], 0)
-        WVPASS(mtime_ts[1] == 0 or mtime_ts[1] == frac_ts[1] * 1000)
-    finally:
-        subprocess.call(['rm', '-rf', tmpdir])
+    with no_lingering_errors():
+        with test_tempdir('bup-txstat-') as tmpdir:
+            path = tmpdir + '/foo'
+            open(path, 'w').close()
+            frac_ts = (0, 10**6 / 2)
+            xstat._bup_utimes(path, (frac_ts, frac_ts))
+            st = _helpers.stat(path)
+            atime_ts = st[8]
+            mtime_ts = st[9]
+            WVPASSEQ(atime_ts[0], 0)
+            WVPASS(atime_ts[1] == 0 or atime_ts[1] == frac_ts[1] * 1000)
+            WVPASSEQ(mtime_ts[0], 0)
+            WVPASS(mtime_ts[1] == 0 or mtime_ts[1] == frac_ts[1] * 1000)
 
 
 @wvtest
 def test_bup_lutimes():
     if not xstat._bup_lutimes:
         return
-    tmpdir = tempfile.mkdtemp(prefix='bup-tmetadata-')
-    try:
-        path = tmpdir + '/foo'
-        open(path, 'w').close()
-        frac_ts = (0, 10**6 / 2)
-        xstat._bup_lutimes(path, (frac_ts, frac_ts))
-        st = _helpers.stat(path)
-        atime_ts = st[8]
-        mtime_ts = st[9]
-        WVPASSEQ(atime_ts[0], 0)
-        WVPASS(atime_ts[1] == 0 or atime_ts[1] == frac_ts[1] * 1000)
-        WVPASSEQ(mtime_ts[0], 0)
-        WVPASS(mtime_ts[1] == 0 or mtime_ts[1] == frac_ts[1] * 1000)
-    finally:
-        subprocess.call(['rm', '-rf', tmpdir])
+    with no_lingering_errors():
+        with test_tempdir('bup-txstat-') as tmpdir:
+            path = tmpdir + '/foo'
+            open(path, 'w').close()
+            frac_ts = (0, 10**6 / 2)
+            xstat._bup_lutimes(path, (frac_ts, frac_ts))
+            st = _helpers.stat(path)
+            atime_ts = st[8]
+            mtime_ts = st[9]
+            WVPASSEQ(atime_ts[0], 0)
+            WVPASS(atime_ts[1] == 0 or atime_ts[1] == frac_ts[1] * 1000)
+            WVPASSEQ(mtime_ts[0], 0)
+            WVPASS(mtime_ts[1] == 0 or mtime_ts[1] == frac_ts[1] * 1000)