MetaStoreWriter.__del__: replace with context management

[bup.git] / wvtest-bup.sh

diff --git a/wvtest-bup.sh b/wvtest-bup.sh
index 2529da3ad0dd96a8715317da44317bf52065fb97..f5cf907fc528fd23212649e6ed88d3cbab670338 100644 (file)
--- a/wvtest-bup.sh
+++ b/wvtest-bup.sh
@@ -5,20 +5,18 @@
 
 . ./wvtest.sh
 
-_wvtop="$(pwd)"
+_wvtop="$(pwd -P)"
 
 wvmktempdir ()
-(
-    script_name="$(basename $0)"
-    set -e -o pipefail
-    mkdir -p "$_wvtop/t/tmp"
-    mktemp -d "$_wvtop/t/tmp/$script_name-XXXXXXX"
-)
+{
+    local script_name="$(basename $0)"
+    mkdir -p "$_wvtop/test/tmp" || exit $?
+    mktemp -d "$_wvtop/test/tmp/$script_name-XXXXXXX" || exit $?
+}
 
 wvmkmountpt ()
-(
-    script_name="$(basename $0)"
-    set -e -o pipefail
-    mkdir -p "$_wvtop/t/mnt"
-    mktemp -d "$_wvtop/t/mnt/$script_name-XXXXXXX"
-)
+{
+    local script_name="$(basename $0)"
+    mkdir -p "$_wvtop/test/mnt" || exit $?
+    mktemp -d "$_wvtop/test/mnt/$script_name-XXXXXXX" || exit $?
+}