aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xtest/apps-x11-xorg/apps-x11-xorg.sh8
-rwxr-xr-xtest/apps-x11-xorg/thunderbird.exp (renamed from test/apps-x11-xorg/icedove.exp)8
-rwxr-xr-xtest/apps-x11/apps-x11.sh8
-rwxr-xr-xtest/apps-x11/thunderbird.exp (renamed from test/apps-x11/icedove.exp)8
-rwxr-xr-xtest/apps/apps.sh8
-rwxr-xr-xtest/apps/thunderbird.exp (renamed from test/apps/icedove.exp)10
6 files changed, 25 insertions, 25 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"
25fi 25fi
26 26
27which icedove 27which thunderbird
28if [ "$?" -eq 0 ]; 28if [ "$?" -eq 0 ];
29then 29then
30 echo "TESTING: icedove x11 xorg" 30 echo "TESTING: thunderbird x11 xorg"
31 ./icedove.exp 31 ./thunderbird.exp
32else 32else
33 echo "TESTING SKIP: icedove not found" 33 echo "TESTING SKIP: thunderbird not found"
34fi 34fi
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
7spawn $env(SHELL) 7spawn $env(SHELL)
8match_max 100000 8match_max 100000
9 9
10send -- "firejail --name=test --x11=xorg --ignore=net --ignore=netfilter --ignore=iprange icedove\r" 10send -- "firejail --name=test --x11=xorg --ignore=net --ignore=netfilter --ignore=iprange thunderbird\r"
11sleep 10 11sleep 10
12 12
13spawn $env(SHELL) 13spawn $env(SHELL)
@@ -18,7 +18,7 @@ expect {
18} 18}
19expect { 19expect {
20 timeout {puts "TESTING ERROR 3.1\n";exit} 20 timeout {puts "TESTING ERROR 3.1\n";exit}
21 "icedove" 21 "thunderbird"
22} 22}
23sleep 1 23sleep 1
24 24
@@ -46,7 +46,7 @@ expect {
46} 46}
47expect { 47expect {
48 timeout {puts "TESTING ERROR 5.0\n";exit} 48 timeout {puts "TESTING ERROR 5.0\n";exit}
49 "icedove" 49 "thunderbird"
50} 50}
51expect { 51expect {
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}
65expect { 65expect {
66 timeout {puts "TESTING ERROR 6.0\n";exit} 66 timeout {puts "TESTING ERROR 6.0\n";exit}
67 "icedove" 67 "thunderbird"
68} 68}
69expect { 69expect {
70 timeout {puts "TESTING ERROR 6.1\n";exit} 70 timeout {puts "TESTING ERROR 6.1\n";exit}
diff --git a/test/apps-x11/apps-x11.sh b/test/apps-x11/apps-x11.sh
index 739a94f2e..965f1a56b 100755
--- a/test/apps-x11/apps-x11.sh
+++ b/test/apps-x11/apps-x11.sh
@@ -77,12 +77,12 @@ else
77 echo "TESTING SKIP: transmission-gtk not found" 77 echo "TESTING SKIP: transmission-gtk not found"
78fi 78fi
79 79
80which icedove 80which thunderbird
81if [ "$?" -eq 0 ]; 81if [ "$?" -eq 0 ];
82then 82then
83 echo "TESTING: icedove x11" 83 echo "TESTING: thunderbird x11"
84 ./icedove.exp 84 ./thunderbird.exp
85else 85else
86 echo "TESTING SKIP: icedove not found" 86 echo "TESTING SKIP: thunderbird not found"
87fi 87fi
88 88
diff --git a/test/apps-x11/icedove.exp b/test/apps-x11/thunderbird.exp
index f81d814a7..060b5a760 100755
--- a/test/apps-x11/icedove.exp
+++ b/test/apps-x11/thunderbird.exp
@@ -7,7 +7,7 @@ set timeout 10
7spawn $env(SHELL) 7spawn $env(SHELL)
8match_max 100000 8match_max 100000
9 9
10send -- "firejail --name=test --x11 icedove\r" 10send -- "firejail --name=test --x11 thunderbird\r"
11sleep 10 11sleep 10
12 12
13spawn $env(SHELL) 13spawn $env(SHELL)
@@ -18,7 +18,7 @@ expect {
18} 18}
19expect { 19expect {
20 timeout {puts "TESTING ERROR 3.1\n";exit} 20 timeout {puts "TESTING ERROR 3.1\n";exit}
21 "icedove" 21 "thunderbird"
22} 22}
23sleep 1 23sleep 1
24 24
@@ -46,7 +46,7 @@ expect {
46} 46}
47expect { 47expect {
48 timeout {puts "TESTING ERROR 5.0\n";exit} 48 timeout {puts "TESTING ERROR 5.0\n";exit}
49 "icedove" 49 "thunderbird"
50} 50}
51expect { 51expect {
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}
65expect { 65expect {
66 timeout {puts "TESTING ERROR 6.0\n";exit} 66 timeout {puts "TESTING ERROR 6.0\n";exit}
67 "icedove" 67 "thunderbird"
68} 68}
69expect { 69expect {
70 timeout {puts "TESTING ERROR 6.1\n";exit} 70 timeout {puts "TESTING ERROR 6.1\n";exit}
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}