.

wcfs/wcfs_test.py

@@ -90,36 +90,34 @@ def test_zurlstable():
         zstor.close()
         assert zurl == testzurl
 
-
+@func
 def test_join():
     zurl = testzurl
     with raises(RuntimeError, match="wcfs: join .*: server not started"):
         wcfs.join(zurl, autostart=False)
 
     wc = wcfs._start(zurl)
+    defer(wc.close)
     assert wc.mountpoint == testmntpt
     assert readfile(wc.mountpoint + "/.wcfs") == zurl
     assert os.path.isdir(wc.mountpoint + "/bigfile")
 
     wc2 = wcfs.join(zurl, autostart=False)
+    defer(wc2.close)
     assert wc2.mountpoint == wc.mountpoint
 
-    wc.close()
-    wc2.close()
-
-
+@func
 def test_join_autostart():
     zurl = testzurl
     with raises(RuntimeError, match="wcfs: join .*: server not started"):
         wcfs.join(zurl, autostart=False)
 
     wc = wcfs.join(zurl, autostart=True)
+    defer(wc.close)
     assert wc.mountpoint == testmntpt
     assert readfile(wc.mountpoint + "/.wcfs") == zurl
     assert os.path.isdir(wc.mountpoint + "/bigfile")
 
-    wc.close()
-
 
 # XXX parametrize zblk0, zblk1
 # XXX select !wcfs mode so that we prepare data through !wcfs path.
@@ -178,6 +176,7 @@ def test_bigfile_empty():
     tidlast = last._p_serial
 
     # XXX force sync of wcfs - how?
+    wcsync(wc)
 
     fsize = 10*blksize + len(s)    # trailing \0 not counted   XXX ok? -> XXX not ok