diff options
Diffstat (limited to 'test/root')
-rwxr-xr-x | test/root/firecfg.exp | 6 | ||||
-rwxr-xr-x | test/root/root.sh | 28 |
2 files changed, 20 insertions, 14 deletions
diff --git a/test/root/firecfg.exp b/test/root/firecfg.exp index 656b8e215..b73167bd1 100755 --- a/test/root/firecfg.exp +++ b/test/root/firecfg.exp | |||
@@ -7,10 +7,10 @@ set timeout 10 | |||
7 | spawn $env(SHELL) | 7 | spawn $env(SHELL) |
8 | match_max 100000 | 8 | match_max 100000 |
9 | 9 | ||
10 | send -- "firecfg\r" | 10 | send -- "firecfg --debug\r" |
11 | sleep 1 | 11 | sleep 1 |
12 | 12 | ||
13 | send -- "firecfg --clean\r" | 13 | send -- "firecfg --debug --clean\r" |
14 | expect { | 14 | expect { |
15 | timeout {puts "TESTING ERROR 0\n";exit} | 15 | timeout {puts "TESTING ERROR 0\n";exit} |
16 | "less removed" | 16 | "less removed" |
@@ -27,7 +27,7 @@ expect { | |||
27 | } | 27 | } |
28 | sleep 1 | 28 | sleep 1 |
29 | 29 | ||
30 | send -- "firecfg\r" | 30 | send -- "firecfg --debug\r" |
31 | expect { | 31 | expect { |
32 | timeout {puts "TESTING ERROR 3\n";exit} | 32 | timeout {puts "TESTING ERROR 3\n";exit} |
33 | "less created" | 33 | "less created" |
diff --git a/test/root/root.sh b/test/root/root.sh index 22b12cf86..d77982993 100755 --- a/test/root/root.sh +++ b/test/root/root.sh | |||
@@ -3,6 +3,23 @@ | |||
3 | # set a new firejail config file | 3 | # set a new firejail config file |
4 | #cp firejail.config /etc/firejail/firejail.config | 4 | #cp firejail.config /etc/firejail/firejail.config |
5 | 5 | ||
6 | |||
7 | #******************************** | ||
8 | # firecfg | ||
9 | #******************************** | ||
10 | which less | ||
11 | if [ "$?" -eq 0 ]; | ||
12 | then | ||
13 | echo "TESTING: firecfg (test/root/firecfg.exp)" | ||
14 | rm -fr /home/netblue/.local/share/applications-store | ||
15 | mv /home/netblue/.local/share/applications /home/netblue/.local/share/applications-store | ||
16 | ./firecfg.exp | ||
17 | rm -fr /home/netblue/.local/share/applications | ||
18 | mv /home/netblue/.local/share/applications-store /home/netblue/.local/share/applications | ||
19 | else | ||
20 | echo "TESTING SKIP: firecfg, less not found" | ||
21 | fi | ||
22 | |||
6 | #******************************** | 23 | #******************************** |
7 | # servers | 24 | # servers |
8 | #******************************** | 25 | #******************************** |
@@ -107,17 +124,6 @@ rm -f tmpfile | |||
107 | echo "TESTING: firemon events (test/root/firemon-events.exp)" | 124 | echo "TESTING: firemon events (test/root/firemon-events.exp)" |
108 | ./firemon-events.exp | 125 | ./firemon-events.exp |
109 | 126 | ||
110 | #******************************** | ||
111 | # firecfg | ||
112 | #******************************** | ||
113 | which less | ||
114 | if [ "$?" -eq 0 ]; | ||
115 | then | ||
116 | echo "TESTING: firecfg (test/root/firecfg.exp)" | ||
117 | ./firecfg.exp | ||
118 | else | ||
119 | echo "TESTING SKIP: firecfg, less not found" | ||
120 | fi | ||
121 | 127 | ||
122 | # restore the default config file | 128 | # restore the default config file |
123 | #cp ../../etc/firejail.config /etc/firejail/firejail.config | 129 | #cp ../../etc/firejail.config /etc/firejail/firejail.config |