Return dmg path and filename from mount_sparsebundle

torarnv · torarnv · commit 3a95b0cd73e4 · 2021-06-27T22:07:56.000+02:00
diff --git a/tests/10_basic.tst b/tests/10_basic.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_expected_size() {
diff --git a/tests/20_allow_other.tst b/tests/20_allow_other.tst
@@ -3,7 +3,7 @@
 source "$(dirname "$0")/testhelpers.sh"
 
 function setup() {
-    mount_sparsebundle -o allow_other
+    read -r mount_dir dmg_file < <(mount_sparsebundle -o allow_other)
 }
 
 function test_dmg_has_correct_permissions() {
diff --git a/tests/testhelpers.sh b/tests/testhelpers.sh
@@ -9,4 +9,6 @@ function mount_sparsebundle() {
         kill -0 $pid >/dev/null 2>&1
         test -f $dmg_file && break || sleep 0.1
     done
+
+    echo $mount_dir "$mount_dir/sparsebundle.dmg"
 }

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`source "$(dirname "$0")/testhelpers.sh"`
`4`	`4`
`5`	`5`	`function setup() {`
`6`		`- mount_sparsebundle`
	`6`	`+ read -r mount_dir dmg_file < <(mount_sparsebundle)`
`7`	`7`	`}`
`8`	`8`
`9`	`9`	`function test_dmg_has_expected_size() {`
Original file line number	Diff line number	Diff line change
`@@ -9,4 +9,6 @@ function mount_sparsebundle() {`
`9`	`9`	`kill -0 $pid >/dev/null 2>&1`
`10`	`10`	`test -f $dmg_file && break \|\| sleep 0.1`
`11`	`11`	`done`
	`12`	`+`
	`13`	`+ echo $mount_dir "$mount_dir/sparsebundle.dmg"`
`12`	`14`	`}`