Cherry-pick upstream test fixes
Reiner Herrmann
4 years ago
| 0 | Author: Reiner Herrmann <reiner@reiner-h.de> | |
| 1 | Description: cherry-pick upstream patches to fix tests | |
| 2 | 7180f26, 35927cb, 6a9bb48, 28eab84 | |
| 3 | ||
| 4 | --- a/test/fs/whitelist-dev.exp | |
| 5 | +++ b/test/fs/whitelist-dev.exp | |
| 6 | @@ -23,17 +23,17 @@ | |
| 7 | send -- "exit\r" | |
| 8 | sleep 1 | |
| 9 | ||
| 10 | -send -- "firejail --whitelist=/dev/null --whitelist=/dev/shm --whitelist=/dev/random\r" | |
| 11 | +send -- "firejail --whitelist=/dev/null --whitelist=/dev/random\r" | |
| 12 | expect { | |
| 13 | timeout {puts "TESTING ERROR 2\n";exit} | |
| 14 | "Child process initialized" | |
| 15 | } | |
| 16 | sleep 1 | |
| 17 | ||
| 18 | -send -- "find /dev | wc -l\r" | |
| 19 | +send -- "ls /dev | wc -l\r" | |
| 20 | expect { | |
| 21 | timeout {puts "TESTING ERROR 3\n";exit} | |
| 22 | - "1" | |
| 23 | + "2" | |
| 24 | } | |
| 25 | after 100 | |
| 26 | send -- "exit\r" | |
| 27 | --- a/test/utils/audit.exp | |
| 28 | +++ b/test/utils/audit.exp | |
| 29 | @@ -32,6 +32,10 @@ | |
| 30 | timeout {puts "TESTING ERROR 5\n";exit} | |
| 31 | "dev directory seems to be fully populated" | |
| 32 | } | |
| 33 | +expect { | |
| 34 | + timeout {puts "TESTING ERROR 5.1\n";exit} | |
| 35 | + "Parent is shutting down, bye..." | |
| 36 | +} | |
| 37 | after 100 | |
| 38 | ||
| 39 | ||
| 40 | @@ -60,6 +64,10 @@ | |
| 41 | timeout {puts "TESTING ERROR 11\n";exit} | |
| 42 | "dev directory seems to be fully populated" | |
| 43 | } | |
| 44 | +expect { | |
| 45 | + timeout {puts "TESTING ERROR 11.1\n";exit} | |
| 46 | + "Parent is shutting down, bye..." | |
| 47 | +} | |
| 48 | after 100 | |
| 49 | ||
| 50 | send -- "firejail --audit=blablabla\r" | |
| 51 | --- /dev/null | |
| 52 | +++ b/etc/allow-ruby.inc | |
| 53 | @@ -0,0 +1,2 @@ | |
| 54 | +noblacklist ${PATH}/ruby | |
| 55 | +noblacklist /usr/lib/ruby | |
| 56 | --- a/test/utils/shutdown.exp | |
| 57 | +++ b/test/utils/shutdown.exp | |
| 58 | @@ -41,7 +41,7 @@ | |
| 59 | } | |
| 60 | after 100 | |
| 61 | ||
| 62 | -send -- "firejail --shutdown=10\r" | |
| 63 | +send -- "firejail --shutdown=1\r" | |
| 64 | expect { | |
| 65 | timeout {puts "TESTING ERROR 5\n";exit} | |
| 66 | "this is not a firejail sandbox" |