diff options
author | glitsj16 <glitsj16@users.noreply.github.com> | 2023-07-19 12:54:53 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-07-19 12:54:53 +0000 |
commit | 9863f982ca148f687a56690e2aeed10014d05e59 (patch) | |
tree | 4bb5bddc7a92a66564031f61d67abe2d4a347500 /test | |
parent | zsh: add shell completion for --tab (diff) | |
download | firejail-9863f982ca148f687a56690e2aeed10014d05e59.tar.gz firejail-9863f982ca148f687a56690e2aeed10014d05e59.tar.zst firejail-9863f982ca148f687a56690e2aeed10014d05e59.zip |
modif: drop deprecated 'shell' option references (#5894)
The `shell` option has been removed. Remove stale references.
This does NOT remove `shell none`-related code comments in:
- src/firejail/fs_lib.c (L433-L441)
- src/firejail/join.c (L415-L417)
Relates to #5196.
Suggested by #5891.
Diffstat (limited to 'test')
-rw-r--r-- | test/environment/shell-none.profile | 1 | ||||
-rwxr-xr-x | test/profiles/ignore.exp | 6 | ||||
-rw-r--r-- | test/profiles/ignore.profile | 2 | ||||
-rw-r--r-- | test/profiles/ignore2.profile | 4 | ||||
-rw-r--r-- | test/profiles/ignore3.profile | 2 | ||||
-rwxr-xr-x | test/utils/build.exp | 4 |
6 files changed, 7 insertions, 12 deletions
diff --git a/test/environment/shell-none.profile b/test/environment/shell-none.profile deleted file mode 100644 index f16ebe3a0..000000000 --- a/test/environment/shell-none.profile +++ /dev/null | |||
@@ -1 +0,0 @@ | |||
1 | shell none | ||
diff --git a/test/profiles/ignore.exp b/test/profiles/ignore.exp index 450d271c1..053d920d3 100755 --- a/test/profiles/ignore.exp +++ b/test/profiles/ignore.exp | |||
@@ -23,7 +23,7 @@ after 100 | |||
23 | send -- "exit\r" | 23 | send -- "exit\r" |
24 | sleep 1 | 24 | sleep 1 |
25 | 25 | ||
26 | send -- "firejail --ignore=seccomp --ignore=shell --profile=ignore.profile \r" | 26 | send -- "firejail --ignore=seccomp --ignore=name --profile=ignore.profile \r" |
27 | expect { | 27 | expect { |
28 | timeout {puts "TESTING ERROR 3\n";exit} | 28 | timeout {puts "TESTING ERROR 3\n";exit} |
29 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" | 29 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
@@ -39,7 +39,7 @@ after 100 | |||
39 | send -- "exit\r" | 39 | send -- "exit\r" |
40 | sleep 1 | 40 | sleep 1 |
41 | 41 | ||
42 | send -- "firejail --ignore=private --ignore=shell --profile=ignore.profile \r" | 42 | send -- "firejail --ignore=private --ignore=name --profile=ignore.profile \r" |
43 | expect { | 43 | expect { |
44 | timeout {puts "TESTING ERROR 5\n";exit} | 44 | timeout {puts "TESTING ERROR 5\n";exit} |
45 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" | 45 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
@@ -66,7 +66,7 @@ after 100 | |||
66 | send -- "exit\r" | 66 | send -- "exit\r" |
67 | sleep 1 | 67 | sleep 1 |
68 | 68 | ||
69 | send -- "firejail --ignore=quiet --ignore=shell --profile=ignore.profile \r" | 69 | send -- "firejail --ignore=quiet --ignore=name --profile=ignore.profile \r" |
70 | expect { | 70 | expect { |
71 | timeout {puts "TESTING ERROR 9\n";exit} | 71 | timeout {puts "TESTING ERROR 9\n";exit} |
72 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" | 72 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
diff --git a/test/profiles/ignore.profile b/test/profiles/ignore.profile index aec231ad2..dec4a5db7 100644 --- a/test/profiles/ignore.profile +++ b/test/profiles/ignore.profile | |||
@@ -1,3 +1,3 @@ | |||
1 | private | 1 | private |
2 | seccomp | 2 | seccomp |
3 | shell none | 3 | name test |
diff --git a/test/profiles/ignore2.profile b/test/profiles/ignore2.profile index c85cd9544..9d7362599 100644 --- a/test/profiles/ignore2.profile +++ b/test/profiles/ignore2.profile | |||
@@ -1,5 +1,5 @@ | |||
1 | ignore seccomp | 1 | ignore seccomp |
2 | ignore shell | 2 | ignore name |
3 | private | 3 | private |
4 | seccomp | 4 | seccomp |
5 | shell none | 5 | name test |
diff --git a/test/profiles/ignore3.profile b/test/profiles/ignore3.profile index f0c9699e1..4ad474851 100644 --- a/test/profiles/ignore3.profile +++ b/test/profiles/ignore3.profile | |||
@@ -1,4 +1,4 @@ | |||
1 | quiet | 1 | quiet |
2 | private | 2 | private |
3 | seccomp | 3 | seccomp |
4 | shell none | 4 | name test |
diff --git a/test/utils/build.exp b/test/utils/build.exp index 3f42a74be..e1ea6af69 100755 --- a/test/utils/build.exp +++ b/test/utils/build.exp | |||
@@ -57,10 +57,6 @@ expect { | |||
57 | } | 57 | } |
58 | expect { | 58 | expect { |
59 | timeout {puts "TESTING ERROR 11\n";exit} | 59 | timeout {puts "TESTING ERROR 11\n";exit} |
60 | "shell none" | ||
61 | } | ||
62 | expect { | ||
63 | timeout {puts "TESTING ERROR 11\n";exit} | ||
64 | "private-bin cat," | 60 | "private-bin cat," |
65 | } | 61 | } |
66 | expect { | 62 | expect { |