Look for sparsebundle.dmg when setting up tests

Author: torarnv

tests/10_basic.tst

@@ -6,11 +6,6 @@ function setup() {
     mount_sparsebundle
 }
 
-function test_dmg_exists_after_mounting() {
-    ls -al $mount_dir
-    test -f $dmg_file
-}
-
 function test_dmg_has_expected_size() {
     size=$(ls -dn $dmg_file | awk '{print $5; exit}')
     test $size -eq 1099511627776

tests/testhelpers.sh

@@ -2,12 +2,11 @@
 function mount_sparsebundle() {
     test ! -z "$TEST_BUNDLE"
     mount_dir=$(mktemp -d)
+    dmg_file="$mount_dir/sparsebundle.dmg"
     sparsebundlefs -s -f -D $* $TEST_BUNDLE $mount_dir &
     pid=$!
     for i in {0..50}; do
         kill -0 $pid >/dev/null 2>&1
-        # FIXME: Find actual mount callback in fuse?
-        grep -q "bundle has" $test_output_file && break || sleep 0.1
+        test -f $dmg_file && break || sleep 0.1
     done
-    dmg_file=$mount_dir/sparsebundle.dmg
 }