mainline merge: tests: skip audit.exp if tests are already running in a pid namespace

2 files changed, 6 insertions, 7 deletions

diff --git a/status b/status
index a0772b14c..f82a9b5bc 100644
--- a/status
+++ b/status
@@ -3,10 +3,9 @@ done: regression: fix whitelisting of symlinks to other home dirs, small improve
 done: tiny memleaks
 done: incomplete fix: whitelisting of symlinks to other home dirs
 done: mount empty home if macro can't be whitelisted
+done: AppArmor: Allow writing to removable media
+done: tests: skip audit.exp if tests are already running in a pid namespace
 
-todo: tests: skip audit.exp if tests are already running in a pid namespace (renerh)
-
-todo: AppArmor: Allow writing to removable media
 
 todo: configure.ac: set sysconfdir only if none was specified manually
 
diff --git a/test/utils/shutdown.exp b/test/utils/shutdown.exp
index 1d4dc9ae4..15a74f8c8 100755
--- a/test/utils/shutdown.exp
+++ b/test/utils/shutdown.exp
@@ -20,7 +20,7 @@ send -- "stty -echo\r"
 after 100
 send --  "firejail --shutdown=shutdowntesting; echo done\r"
 expect {
-        timeout {puts "TESTING ERROR 4\n";exit}
+        timeout {puts "TESTING ERROR 1\n";exit}
         "done"
 }
 sleep 5
@@ -28,15 +28,15 @@ sleep 5
 spawn $env(SHELL)
 send --  "firejail --list;echo done\r"
 expect {
-        timeout {puts "TESTING ERROR 5\n";exit}
-        "shutdowntesting" {puts "TESTING ERROR 6\n";exit}
+        timeout {puts "TESTING ERROR 2\n";exit}
+        "shutdowntesting" {puts "TESTING ERROR 3\n";exit}
         "done"
 }
 sleep 1
 
 send --  "firejail --shutdown=sutdowntesting\r"
 expect {
-        timeout {puts "TESTING ERROR 5\n";exit}
+        timeout {puts "TESTING ERROR 4\n";exit}
         "cannot find sandbox sutdowntesting"
 }
 after 100