Pass mount dir and DMG file out of mount_sparsebundle

Author: torarnv

tests/20_mount.tst

@@ -3,7 +3,7 @@
 source "$(dirname "$0")/testhelpers.sh"
 
 function setup() {
-    mount_sparsebundle
+    read -r mount_dir dmg_file < <(mount_sparsebundle)
 }
 
 function test_dmg_has_correct_number_of_blocks() {
@@ -18,6 +18,5 @@ function test_dmg_contents_is_same_as_testdata() {
 }
 
 function teardown() {
-    umount $mount_dir
-    rm -Rf $mount_dir
+    umount $mount_dir && rm -Rf $mount_dir
 }

tests/30_noreadbuf.tst

@@ -3,7 +3,7 @@
 source "$(dirname "$0")/testhelpers.sh"
 
 function setup() {
-    mount_sparsebundle -o noreadbuf
+    read -r mount_dir dmg_file < <(mount_sparsebundle -o noreadbuf)
 }
 
 function test_dmg_has_correct_number_of_blocks() {
@@ -18,6 +18,5 @@ function test_dmg_contents_is_same_as_testdata() {
 }
 
 function teardown() {
-    umount $mount_dir
-    rm -Rf $mount_dir
+    umount $mount_dir && rm -Rf $mount_dir
 }

tests/testhelpers.sh

@@ -1,10 +1,10 @@
 
 function mount_sparsebundle() {
     test ! -z "$TEST_BUNDLE"
-    mount_dir=$(mktemp -d)
-    dmg_file="$mount_dir/sparsebundle.dmg"
+    local mount_dir=$(mktemp -d)
+    local dmg_file="$mount_dir/sparsebundle.dmg"
     sparsebundlefs -s -f -D $* $TEST_BUNDLE $mount_dir &
-    pid=$!
+    local pid=$!
     for i in {0..50}; do
         kill -0 $pid >/dev/null 2>&1
         test -f $dmg_file && break || sleep 0.1