diff options
author | Reiner Herrmann <reiner@reiner-h.de> | 2017-03-25 12:44:45 +0100 |
---|---|---|
committer | Reiner Herrmann <reiner@reiner-h.de> | 2017-03-25 12:44:45 +0100 |
commit | 118afb4479662881160b96b0cdfa2f07825ae910 (patch) | |
tree | 785d9e7b845df26e80f07b3e13efb274360df88e /test/apps | |
parent | testing (diff) | |
download | firejail-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-x | test/apps/apps.sh | 8 | ||||
-rwxr-xr-x | test/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" |
107 | fi | 107 | fi |
108 | 108 | ||
109 | which icedove | 109 | which thunderbird |
110 | if [ "$?" -eq 0 ]; | 110 | if [ "$?" -eq 0 ]; |
111 | then | 111 | then |
112 | echo "TESTING: icedove" | 112 | echo "TESTING: thunderbird" |
113 | ./icedove.exp | 113 | ./thunderbird.exp |
114 | else | 114 | else |
115 | echo "TESTING SKIP: icedove not found" | 115 | echo "TESTING SKIP: thunderbird not found" |
116 | fi | 116 | fi |
117 | 117 | ||
118 | which vlc | 118 | which 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 | |||
7 | spawn $env(SHELL) | 7 | spawn $env(SHELL) |
8 | match_max 100000 | 8 | match_max 100000 |
9 | 9 | ||
10 | send -- "firejail icedove\r" | 10 | send -- "firejail thunderbird\r" |
11 | expect { | 11 | expect { |
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 | } |
15 | expect { | 15 | expect { |
16 | timeout {puts "TESTING ERROR 1\n";exit} | 16 | timeout {puts "TESTING ERROR 1\n";exit} |
@@ -26,7 +26,7 @@ expect { | |||
26 | } | 26 | } |
27 | expect { | 27 | expect { |
28 | timeout {puts "TESTING ERROR 3.1\n";exit} | 28 | timeout {puts "TESTING ERROR 3.1\n";exit} |
29 | "icedove" | 29 | "thunderbird" |
30 | } | 30 | } |
31 | after 100 | 31 | after 100 |
32 | 32 | ||
@@ -50,7 +50,7 @@ send -- "firemon --seccomp\r" | |||
50 | expect { | 50 | expect { |
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 | } |
55 | expect { | 55 | expect { |
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 | |||
64 | send -- "firemon --caps\r" | 64 | send -- "firemon --caps\r" |
65 | expect { | 65 | expect { |
66 | timeout {puts "TESTING ERROR 6\n";exit} | 66 | timeout {puts "TESTING ERROR 6\n";exit} |
67 | ":firejail icedove" | 67 | ":firejail thunderbird" |
68 | } | 68 | } |
69 | expect { | 69 | expect { |
70 | timeout {puts "TESTING ERROR 6.1\n";exit} | 70 | timeout {puts "TESTING ERROR 6.1\n";exit} |