testing

3 files changed, 27 insertions, 4 deletions

diff --git a/test/appimage/appimage-args.exp b/test/appimage/appimage-args.exp
index f304f5b94..b93ad509d 100755
--- a/test/appimage/appimage-args.exp
+++ b/test/appimage/appimage-args.exp
@@ -7,6 +7,7 @@ set timeout 10
 spawn $env(SHELL)
 match_max 100000
 
+set appimage_id $spawn_id
 send -- "firejail --name=appimage-test --debug --appimage Leafpad-0.8.17-x86_64.AppImage testfile\r"
 expect {
         timeout {puts "TESTING ERROR 1\n";exit}
@@ -91,7 +92,14 @@ after 100
 
 spawn $env(SHELL)
 send -- "firejail --shutdown=appimage-test\r"
-sleep 3
+
+set spawn_id $appimage_id
+expect {
+        timeout {puts "TESTING ERROR 15\n";exit}
+        "AppImage unmounted"
+}
+
+after 100
 
 puts "\nall done\n"
 
diff --git a/test/appimage/appimage-v1.exp b/test/appimage/appimage-v1.exp
index d9b64af1d..3364ff677 100755
--- a/test/appimage/appimage-v1.exp
+++ b/test/appimage/appimage-v1.exp
@@ -6,6 +6,7 @@
 set timeout 10
 spawn $env(SHELL)
 match_max 100000
+set appimage_id $spawn_id
 
 send -- "firejail --name=appimage-test --debug --appimage Leafpad-0.8.17-x86_64.AppImage\r"
 expect {
@@ -79,7 +80,14 @@ after 100
 
 spawn $env(SHELL)
 send -- "firejail --shutdown=appimage-test\r"
-sleep 3
+
+set spawn_id $appimage_id
+expect {
+        timeout {puts "TESTING ERROR 7\n";exit}
+        "AppImage unmounted"
+}
+
+after 100
 
 puts "\nall done\n"
 
diff --git a/test/appimage/appimage-v2.exp b/test/appimage/appimage-v2.exp
index 10443a1c7..ad741c559 100755
--- a/test/appimage/appimage-v2.exp
+++ b/test/appimage/appimage-v2.exp
@@ -6,8 +6,9 @@
 set timeout 10
 spawn $env(SHELL)
 match_max 100000
+set appimage_id $spawn_id
 
-send -- "firejail --appimage Leafpad-0.8.18.1.glibc2.4-x86_64.AppImage\r"
+send -- "firejail --name=appimage-test --appimage Leafpad-0.8.18.1.glibc2.4-x86_64.AppImage\r"
 expect {
         timeout {puts "TESTING ERROR 1\n";exit}
         "Child process initialized"
@@ -79,7 +80,13 @@ after 100
 
 spawn $env(SHELL)
 send -- "firejail --shutdown=appimage-test\r"
-sleep 3
+set spawn_id $appimage_id
+expect {
+        timeout {puts "TESTING ERROR 7\n";exit}
+        "AppImage unmounted"
+}
+
+after 100
 
 puts "\nall done\n"