From e4307b409b72a7329ede7a3c54a8c8cd793c8d42 Mon Sep 17 00:00:00 2001 From: startx2017 Date: Thu, 29 Jul 2021 08:07:28 -0400 Subject: fix whitelist/allow in make test-utils --- test/utils/build.exp | 9 +++++---- test/utils/utils.sh | 4 ++-- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/test/utils/build.exp b/test/utils/build.exp index 7fbe969a4..104ac037c 100755 --- a/test/utils/build.exp +++ b/test/utils/build.exp @@ -7,13 +7,13 @@ set timeout 10 spawn $env(SHELL) match_max 100000 -send -- "echo testing > ~/firejail-test-file-7699\r" +send -- "echo testing > ~/_firejail-test-file\r" after 100 -send -- "firejail --build cat ~/firejail-test-file-7699\r" +send -- "firejail --build cat ~/_firejail-test-file\r" expect { timeout {puts "TESTING ERROR 0\n";exit} - "whitelist $\{HOME\}/firejail-test-file-7699" + "allow $\{HOME\}/_firejail-test-file" } expect { timeout {puts "TESTING ERROR 1\n";exit} @@ -77,7 +77,8 @@ expect { } after 100 - +send -- "rm -f ~/_firejail-test-file\r" +after 100 send -- "firejail --build cat /etc/passwd\r" expect { diff --git a/test/utils/utils.sh b/test/utils/utils.sh index c021d6287..e3e24bd9a 100755 --- a/test/utils/utils.sh +++ b/test/utils/utils.sh @@ -15,8 +15,8 @@ export PATH="$PATH:/usr/lib/firejail:/usr/lib64/firejail" echo "TESTING: build (test/utils/build.exp)" ./build.exp -rm -f ~/firejail-test-file-7699 -rm -f firejail-test-file-4388 +rm -f ~/_firejail-test-file +rm -f _firejail-test-file echo "TESTING: name (test/utils/name.exp)" ./name.exp -- cgit v1.2.3-54-g00ecf