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-x11-xorg | |
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-x11-xorg')
-rwxr-xr-x | test/apps-x11-xorg/apps-x11-xorg.sh | 8 | ||||
-rwxr-xr-x | test/apps-x11-xorg/thunderbird.exp (renamed from test/apps-x11-xorg/icedove.exp) | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/test/apps-x11-xorg/apps-x11-xorg.sh b/test/apps-x11-xorg/apps-x11-xorg.sh index d39d8390e..7d1d681ab 100755 --- a/test/apps-x11-xorg/apps-x11-xorg.sh +++ b/test/apps-x11-xorg/apps-x11-xorg.sh | |||
@@ -24,12 +24,12 @@ else | |||
24 | echo "TESTING SKIP: transmission-gtk not found" | 24 | echo "TESTING SKIP: transmission-gtk not found" |
25 | fi | 25 | fi |
26 | 26 | ||
27 | which icedove | 27 | which thunderbird |
28 | if [ "$?" -eq 0 ]; | 28 | if [ "$?" -eq 0 ]; |
29 | then | 29 | then |
30 | echo "TESTING: icedove x11 xorg" | 30 | echo "TESTING: thunderbird x11 xorg" |
31 | ./icedove.exp | 31 | ./thunderbird.exp |
32 | else | 32 | else |
33 | echo "TESTING SKIP: icedove not found" | 33 | echo "TESTING SKIP: thunderbird not found" |
34 | fi | 34 | fi |
35 | 35 | ||
diff --git a/test/apps-x11-xorg/icedove.exp b/test/apps-x11-xorg/thunderbird.exp index 8f6722cd7..1626c732b 100755 --- a/test/apps-x11-xorg/icedove.exp +++ b/test/apps-x11-xorg/thunderbird.exp | |||
@@ -7,7 +7,7 @@ set timeout 10 | |||
7 | spawn $env(SHELL) | 7 | spawn $env(SHELL) |
8 | match_max 100000 | 8 | match_max 100000 |
9 | 9 | ||
10 | send -- "firejail --name=test --x11=xorg --ignore=net --ignore=netfilter --ignore=iprange icedove\r" | 10 | send -- "firejail --name=test --x11=xorg --ignore=net --ignore=netfilter --ignore=iprange thunderbird\r" |
11 | sleep 10 | 11 | sleep 10 |
12 | 12 | ||
13 | spawn $env(SHELL) | 13 | spawn $env(SHELL) |
@@ -18,7 +18,7 @@ expect { | |||
18 | } | 18 | } |
19 | expect { | 19 | expect { |
20 | timeout {puts "TESTING ERROR 3.1\n";exit} | 20 | timeout {puts "TESTING ERROR 3.1\n";exit} |
21 | "icedove" | 21 | "thunderbird" |
22 | } | 22 | } |
23 | sleep 1 | 23 | sleep 1 |
24 | 24 | ||
@@ -46,7 +46,7 @@ expect { | |||
46 | } | 46 | } |
47 | expect { | 47 | expect { |
48 | timeout {puts "TESTING ERROR 5.0\n";exit} | 48 | timeout {puts "TESTING ERROR 5.0\n";exit} |
49 | "icedove" | 49 | "thunderbird" |
50 | } | 50 | } |
51 | expect { | 51 | expect { |
52 | timeout {puts "TESTING ERROR 5.1 (seccomp)\n";exit} | 52 | timeout {puts "TESTING ERROR 5.1 (seccomp)\n";exit} |
@@ -64,7 +64,7 @@ expect { | |||
64 | } | 64 | } |
65 | expect { | 65 | expect { |
66 | timeout {puts "TESTING ERROR 6.0\n";exit} | 66 | timeout {puts "TESTING ERROR 6.0\n";exit} |
67 | "icedove" | 67 | "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} |