From 2a4eca185266ef26fd71816d0e36eee815c8a486 Mon Sep 17 00:00:00 2001 From: netblue30 Date: Sun, 8 Nov 2020 08:50:04 -0500 Subject: mkdir ci testing --- test/fs/mkdir.exp | 43 +++++++++++++++++-------------------------- 1 file changed, 17 insertions(+), 26 deletions(-) (limited to 'test/fs') diff --git a/test/fs/mkdir.exp b/test/fs/mkdir.exp index 49fef38cc..61029ec18 100755 --- a/test/fs/mkdir.exp +++ b/test/fs/mkdir.exp @@ -7,18 +7,6 @@ set timeout 3 spawn $env(SHELL) match_max 100000 - -# debugging github-ci - do we have a /run/user/1001 directory? -send "echo %%%%%%%%%%%%%%%%%%%%%%%%%%\r" -after 100 -send "ls -l /run/user\r" -after 100 -send "find /run/user\r" -after 100 -send "echo %%%%%%%%%%%%%%%%%%%%%%%%%%\r" -after 100 - - send -- "rm -fr ~/.firejail_test\r" after 100 @@ -39,20 +27,23 @@ send -- "rm -rf /tmp/.firejail_test\r" after 100 set UID [exec id -u] -send -- "firejail --profile=mkdir.profile find /run/user/$UID/.firejail_test\r" -expect { - timeout {puts "TESTING ERROR 3.1\n";exit} - "/run/user/$UID/.firejail_test/a/b/c/d.txt" +set fexist [file exist /run/user/$UID] +if { $fexist } { + send -- "firejail --profile=mkdir.profile find /run/user/$UID/.firejail_test\r" + expect { + timeout {puts "TESTING ERROR 3.1\n";exit} + "/run/user/$UID/.firejail_test/a/b/c/d.txt" + } + send -- "rm -rf /run/user/$UID/.firejail_test\r" + after 100 + + + send -- "firejail --profile=mkdir2.profile\r" + expect { + timeout {puts "TESTING ERROR 4\n";exit} + "only files or directories in user home, /tmp, or /run/user/" + } + after 100 } -send -- "rm -rf /run/user/$UID/.firejail_test\r" -after 100 - - -send -- "firejail --profile=mkdir2.profile\r" -expect { - timeout {puts "TESTING ERROR 4\n";exit} - "only files or directories in user home, /tmp, or /run/user/" -} -after 100 puts "\nall done\n" -- cgit v1.2.3-54-g00ecf