aboutsummaryrefslogtreecommitdiffstats
path: root/test/apps
diff options
context:
space:
mode:
authorLibravatar Reiner Herrmann <reiner@reiner-h.de>2017-03-25 12:44:45 +0100
committerLibravatar Reiner Herrmann <reiner@reiner-h.de>2017-03-25 12:44:45 +0100
commit118afb4479662881160b96b0cdfa2f07825ae910 (patch)
tree785d9e7b845df26e80f07b3e13efb274360df88e /test/apps
parenttesting (diff)
downloadfirejail-118afb4479662881160b96b0cdfa2f07825ae910.tar.gz
firejail-118afb4479662881160b96b0cdfa2f07825ae910.tar.zst
firejail-118afb4479662881160b96b0cdfa2f07825ae910.zip
Use thunderbird instead of icedove for testing
Thunderbird is back in Debian, and Icedove is gone. Tests will then also run in more distributions.
Diffstat (limited to 'test/apps')
-rwxr-xr-xtest/apps/apps.sh8
-rwxr-xr-xtest/apps/thunderbird.exp (renamed from test/apps/icedove.exp)10
2 files changed, 9 insertions, 9 deletions
diff --git a/test/apps/apps.sh b/test/apps/apps.sh
index 4b7afe1a9..fc04f188b 100755
--- a/test/apps/apps.sh
+++ b/test/apps/apps.sh
@@ -106,13 +106,13 @@ else
106 echo "TESTING SKIP: gthumb not found" 106 echo "TESTING SKIP: gthumb not found"
107fi 107fi
108 108
109which icedove 109which thunderbird
110if [ "$?" -eq 0 ]; 110if [ "$?" -eq 0 ];
111then 111then
112 echo "TESTING: icedove" 112 echo "TESTING: thunderbird"
113 ./icedove.exp 113 ./thunderbird.exp
114else 114else
115 echo "TESTING SKIP: icedove not found" 115 echo "TESTING SKIP: thunderbird not found"
116fi 116fi
117 117
118which vlc 118which vlc
diff --git a/test/apps/icedove.exp b/test/apps/thunderbird.exp
index 1acb59112..16b0dc60e 100755
--- a/test/apps/icedove.exp
+++ b/test/apps/thunderbird.exp
@@ -7,10 +7,10 @@ set timeout 10
7spawn $env(SHELL) 7spawn $env(SHELL)
8match_max 100000 8match_max 100000
9 9
10send -- "firejail icedove\r" 10send -- "firejail thunderbird\r"
11expect { 11expect {
12 timeout {puts "TESTING ERROR 0\n";exit} 12 timeout {puts "TESTING ERROR 0\n";exit}
13 "Reading profile /etc/firejail/icedove.profile" 13 "Reading profile /etc/firejail/thunderbird.profile"
14} 14}
15expect { 15expect {
16 timeout {puts "TESTING ERROR 1\n";exit} 16 timeout {puts "TESTING ERROR 1\n";exit}
@@ -26,7 +26,7 @@ expect {
26} 26}
27expect { 27expect {
28 timeout {puts "TESTING ERROR 3.1\n";exit} 28 timeout {puts "TESTING ERROR 3.1\n";exit}
29 "icedove" 29 "thunderbird"
30} 30}
31after 100 31after 100
32 32
@@ -50,7 +50,7 @@ send -- "firemon --seccomp\r"
50expect { 50expect {
51 timeout {puts "TESTING ERROR 5\n";exit} 51 timeout {puts "TESTING ERROR 5\n";exit}
52 "need to be root" {puts "/proc mounted as hidepid, exiting...\n"; exit} 52 "need to be root" {puts "/proc mounted as hidepid, exiting...\n"; exit}
53 ":firejail icedove" 53 ":firejail thunderbird"
54} 54}
55expect { 55expect {
56 timeout {puts "TESTING ERROR 5.1 (seccomp)\n";exit} 56 timeout {puts "TESTING ERROR 5.1 (seccomp)\n";exit}
@@ -64,7 +64,7 @@ after 100
64send -- "firemon --caps\r" 64send -- "firemon --caps\r"
65expect { 65expect {
66 timeout {puts "TESTING ERROR 6\n";exit} 66 timeout {puts "TESTING ERROR 6\n";exit}
67 ":firejail icedove" 67 ":firejail thunderbird"
68} 68}
69expect { 69expect {
70 timeout {puts "TESTING ERROR 6.1\n";exit} 70 timeout {puts "TESTING ERROR 6.1\n";exit}