aboutsummaryrefslogtreecommitdiffstats
path: root/test/root
diff options
context:
space:
mode:
authorLibravatar netblue30 <netblue30@yahoo.com>2018-04-01 10:41:00 -0400
committerLibravatar netblue30 <netblue30@yahoo.com>2018-04-01 10:41:00 -0400
commit80d0d452d660f2c77af94fc35d2caaea7cfd1cae (patch)
tree6887b38cef478cf917cc99b56e1d622635e78e02 /test/root
parenttesting (diff)
downloadfirejail-80d0d452d660f2c77af94fc35d2caaea7cfd1cae.tar.gz
firejail-80d0d452d660f2c77af94fc35d2caaea7cfd1cae.tar.zst
firejail-80d0d452d660f2c77af94fc35d2caaea7cfd1cae.zip
testing
Diffstat (limited to 'test/root')
-rwxr-xr-xtest/root/firecfg.exp6
-rwxr-xr-xtest/root/root.sh28
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
7spawn $env(SHELL) 7spawn $env(SHELL)
8match_max 100000 8match_max 100000
9 9
10send -- "firecfg\r" 10send -- "firecfg --debug\r"
11sleep 1 11sleep 1
12 12
13send -- "firecfg --clean\r" 13send -- "firecfg --debug --clean\r"
14expect { 14expect {
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}
28sleep 1 28sleep 1
29 29
30send -- "firecfg\r" 30send -- "firecfg --debug\r"
31expect { 31expect {
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#********************************
10which less
11if [ "$?" -eq 0 ];
12then
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
19else
20 echo "TESTING SKIP: firecfg, less not found"
21fi
22
6#******************************** 23#********************************
7# servers 24# servers
8#******************************** 25#********************************
@@ -107,17 +124,6 @@ rm -f tmpfile
107echo "TESTING: firemon events (test/root/firemon-events.exp)" 124echo "TESTING: firemon events (test/root/firemon-events.exp)"
108./firemon-events.exp 125./firemon-events.exp
109 126
110#********************************
111# firecfg
112#********************************
113which less
114if [ "$?" -eq 0 ];
115then
116 echo "TESTING: firecfg (test/root/firecfg.exp)"
117 ./firecfg.exp
118else
119 echo "TESTING SKIP: firecfg, less not found"
120fi
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