Commit f2ea6f9f6885812c5de4bae19f79ecf8d0e1ab94 - firejail

Import another test fix and skip faudit test inside containers Reiner Herrmann 4 years ago

1 changed file(s) with 21 addition(s) and 1 deletion(s). Raw diff Collapse all Expand all

+21

-1

debian/patches/fix-tests.patch less more

0	0	Author: Reiner Herrmann <reiner@reiner-h.de>
1	1	Description: cherry-pick upstream patches to fix tests
2		7180f26, 35927cb, 6a9bb48, 28eab84
	2	7180f26, 35927cb, 6a9bb48, 28eab84, 80b5030
3	3
4	4	--- a/test/fs/whitelist-dev.exp
5	5	+++ b/test/fs/whitelist-dev.exp

24	24	}
25	25	after 100
26	26	send -- "exit\r"
	27	@@ -49,6 +49,8 @@
	28	send -- "ls /dev \| wc -l\r"
	29	expect {
	30	timeout {puts "TESTING ERROR 5\n";exit}
	31	+ "10" {puts "OK\n"}
	32	+ "11" {puts "OK\n"}
	33	"12" {puts "OK\n"}
	34	"13" {puts "OK\n"}
	35	"14" {puts "OK\n"}
27	36	--- a/test/utils/audit.exp
28	37	+++ b/test/utils/audit.exp
29	38	@@ -32,6 +32,10 @@

64	73	expect {
65	74	timeout {puts "TESTING ERROR 5\n";exit}
66	75	"this is not a firejail sandbox"
	76	--- a/test/utils/utils.sh
	77	+++ b/test/utils/utils.sh
	78	@@ -23,7 +23,7 @@
	79	rm -f /var/tmp/firejail-test-file-7699
	80	rm -f firejail-test-file-4388
	81
	82	-if [ $(readlink /proc/self) -lt 100 ]; then
	83	+if [ $(readlink /proc/self) -lt 100 -o -z "$container" ]; then
	84	echo "TESTING SKIP: already running in pid namespace (test/utils/audit.exp)"
	85	else
	86	echo "TESTING: audit (test/utils/audit.exp)"