vfs: rely on FakeLink's target in readlink

[bup.git] / lib / bup / t / tbloom.py

diff --git a/lib/bup/t/tbloom.py b/lib/bup/t/tbloom.py
index 2f1cce561cff22f151132f65013b9aff45498410..2f17046eb002bab12b17049870dd4da775f99517 100644 (file)
--- a/lib/bup/t/tbloom.py
+++ b/lib/bup/t/tbloom.py
@@ -1,52 +1,61 @@
+
+from __future__ import absolute_import
 import errno, platform, tempfile
-from bup import bloom
-from bup.helpers import *
+
 from wvtest import *
 
+from bup import bloom
+from bup.helpers import mkdirp
+from buptest import no_lingering_errors, test_tempdir
+
+
 @wvtest
 def test_bloom():
-    hashes = [os.urandom(20) for i in range(100)]
-    class Idx:
-        pass
-    ix = Idx()
-    ix.name='dummy.idx'
-    ix.shatable = ''.join(hashes)
-    for k in (4, 5):
-        b = bloom.create('pybuptest.bloom', expected=100, k=k)
-        b.add_idx(ix)
-        WVPASSLT(b.pfalse_positive(), .1)
-        b.close()
-        b = bloom.ShaBloom('pybuptest.bloom')
-        all_present = True
-        for h in hashes:
-            all_present &= b.exists(h)
-        WVPASS(all_present)
-        false_positives = 0
-        for h in [os.urandom(20) for i in range(1000)]:
-            if b.exists(h):
-                false_positives += 1
-        WVPASSLT(false_positives, 5)
-        os.unlink('pybuptest.bloom')
+    with no_lingering_errors():
+        with test_tempdir('bup-tbloom-') as tmpdir:
+            hashes = [os.urandom(20) for i in range(100)]
+            class Idx:
+                pass
+            ix = Idx()
+            ix.name='dummy.idx'
+            ix.shatable = ''.join(hashes)
+            for k in (4, 5):
+                b = bloom.create(tmpdir + '/pybuptest.bloom', expected=100, k=k)
+                b.add_idx(ix)
+                WVPASSLT(b.pfalse_positive(), .1)
+                b.close()
+                b = bloom.ShaBloom(tmpdir + '/pybuptest.bloom')
+                all_present = True
+                for h in hashes:
+                    all_present &= b.exists(h)
+                WVPASS(all_present)
+                false_positives = 0
+                for h in [os.urandom(20) for i in range(1000)]:
+                    if b.exists(h):
+                        false_positives += 1
+                WVPASSLT(false_positives, 5)
+                os.unlink(tmpdir + '/pybuptest.bloom')
 
-    tf = tempfile.TemporaryFile()
-    b = bloom.create('bup.bloom', f=tf, expected=100)
-    WVPASSEQ(b.rwfile, tf)
-    WVPASSEQ(b.k, 5)
+            tf = tempfile.TemporaryFile(dir=tmpdir)
+            b = bloom.create('bup.bloom', f=tf, expected=100)
+            WVPASSEQ(b.rwfile, tf)
+            WVPASSEQ(b.k, 5)
 
-    # Test large (~1GiB) filter.  This may fail on s390 (31-bit
-    # architecture), and anywhere else where the address space is
-    # sufficiently limited.
-    tf = tempfile.TemporaryFile()
-    skip_test = False
-    try:
-        b = bloom.create('bup.bloom', f=tf, expected=2**28, delaywrite=False)
-    except EnvironmentError, ex:
-        (ptr_width, linkage) = platform.architecture()
-        if ptr_width == '32bit' and ex.errno == errno.ENOMEM:
-            WVMSG('skipping large bloom filter test (mmap probably failed) '
-                  + str(ex))
-            skip_test = True
-        else:
-            raise
-    if not skip_test:
-        WVPASSEQ(b.k, 4)
+            # Test large (~1GiB) filter.  This may fail on s390 (31-bit
+            # architecture), and anywhere else where the address space is
+            # sufficiently limited.
+            tf = tempfile.TemporaryFile(dir=tmpdir)
+            skip_test = False
+            try:
+                b = bloom.create('bup.bloom', f=tf, expected=2**28,
+                                 delaywrite=False)
+            except EnvironmentError as ex:
+                (ptr_width, linkage) = platform.architecture()
+                if ptr_width == '32bit' and ex.errno == errno.ENOMEM:
+                    WVMSG('skipping large bloom filter test (mmap probably failed) '
+                          + str(ex))
+                    skip_test = True
+                else:
+                    raise
+            if not skip_test:
+                WVPASSEQ(b.k, 4)