aboutsummaryrefslogtreecommitdiffstats
path: root/test/network
diff options
context:
space:
mode:
authorLibravatar Reiner Herrmann <reiner@reiner-h.de>2017-04-17 00:06:53 +0200
committerLibravatar Reiner Herrmann <reiner@reiner-h.de>2017-04-17 00:06:53 +0200
commit575aca9482de3a1d81dbf45fa7734de229858558 (patch)
treef0b2fdeaee1b41f50ae0f74c3f1527bf7914e8c5 /test/network
parenttest: rm has no output by default (diff)
downloadfirejail-575aca9482de3a1d81dbf45fa7734de229858558.tar.gz
firejail-575aca9482de3a1d81dbf45fa7734de229858558.tar.zst
firejail-575aca9482de3a1d81dbf45fa7734de229858558.zip
test: adapt output to newer versions of iproute2 and net-tools
iproute2 now prevents output of double spaces
Diffstat (limited to 'test/network')
-rwxr-xr-xtest/network/4bridges_arp.exp12
-rwxr-xr-xtest/network/4bridges_ip.exp12
-rwxr-xr-xtest/network/interface.exp8
-rwxr-xr-xtest/network/net_defaultgw.exp3
-rwxr-xr-xtest/network/net_defaultgw2.exp6
-rwxr-xr-xtest/network/net_ip.exp3
-rwxr-xr-xtest/network/net_profile.exp6
7 files changed, 33 insertions, 17 deletions
diff --git a/test/network/4bridges_arp.exp b/test/network/4bridges_arp.exp
index 80760eb3a..e84ec719c 100755
--- a/test/network/4bridges_arp.exp
+++ b/test/network/4bridges_arp.exp
@@ -150,22 +150,26 @@ expect {
150send -- "ip route show\r" 150send -- "ip route show\r"
151expect { 151expect {
152 timeout {puts "TESTING ERROR 10.2\n";exit} 152 timeout {puts "TESTING ERROR 10.2\n";exit}
153 "10.10.20.0/29 dev eth0 proto kernel scope link" 153 "10.10.20.0/29 dev eth0 proto kernel scope link" {puts "old iproute2\n";}
154 "10.10.20.0/29 dev eth0 proto kernel scope link" {puts "new iproute2\n";}
154} 155}
155send -- "ip route show\r" 156send -- "ip route show\r"
156expect { 157expect {
157 timeout {puts "TESTING ERROR 10.2\n";exit} 158 timeout {puts "TESTING ERROR 10.2\n";exit}
158 "10.10.30.0/24 dev eth1 proto kernel scope link" 159 "10.10.30.0/24 dev eth1 proto kernel scope link" {puts "old iproute2\n";}
160 "10.10.30.0/24 dev eth1 proto kernel scope link" {puts "new iproute2\n";}
159} 161}
160send -- "ip route show\r" 162send -- "ip route show\r"
161expect { 163expect {
162 timeout {puts "TESTING ERROR 10.2\n";exit} 164 timeout {puts "TESTING ERROR 10.2\n";exit}
163 "10.10.40.0/24 dev eth2 proto kernel scope link" 165 "10.10.40.0/24 dev eth2 proto kernel scope link" {puts "old iproute2\n";}
166 "10.10.40.0/24 dev eth2 proto kernel scope link" {puts "new iproute2\n";}
164} 167}
165send -- "ip route show\r" 168send -- "ip route show\r"
166expect { 169expect {
167 timeout {puts "TESTING ERROR 10.2\n";exit} 170 timeout {puts "TESTING ERROR 10.2\n";exit}
168 "10.10.50.0/24 dev eth3 proto kernel scope link" 171 "10.10.50.0/24 dev eth3 proto kernel scope link" {puts "old iproute2\n";}
172 "10.10.50.0/24 dev eth3 proto kernel scope link" {puts "new iproute2\n";}
169} 173}
170send -- "exit\r" 174send -- "exit\r"
171after 100 175after 100
diff --git a/test/network/4bridges_ip.exp b/test/network/4bridges_ip.exp
index 5e136926b..74a1e5d68 100755
--- a/test/network/4bridges_ip.exp
+++ b/test/network/4bridges_ip.exp
@@ -150,25 +150,29 @@ expect {
150send -- "ip route show\r" 150send -- "ip route show\r"
151expect { 151expect {
152 timeout {puts "TESTING ERROR 10.2\n";exit} 152 timeout {puts "TESTING ERROR 10.2\n";exit}
153 "10.10.20.0/29 dev eth0 proto kernel scope link" 153 "10.10.20.0/29 dev eth0 proto kernel scope link" {puts "old iproute2\n";}
154 "10.10.20.0/29 dev eth0 proto kernel scope link" {puts "new iproute2\n";}
154} 155}
155 156
156send -- "ip route show\r" 157send -- "ip route show\r"
157expect { 158expect {
158 timeout {puts "TESTING ERROR 10.3\n";exit} 159 timeout {puts "TESTING ERROR 10.3\n";exit}
159 "10.10.30.0/24 dev eth1 proto kernel scope link src 10.10.30.50" 160 "10.10.30.0/24 dev eth1 proto kernel scope link src 10.10.30.50" {puts "old iproute2\n";}
161 "10.10.30.0/24 dev eth1 proto kernel scope link src 10.10.30.50" {puts "new iproute2\n";}
160} 162}
161 163
162send -- "ip route show\r" 164send -- "ip route show\r"
163expect { 165expect {
164 timeout {puts "TESTING ERROR 10.4\n";exit} 166 timeout {puts "TESTING ERROR 10.4\n";exit}
165 "10.10.40.0/24 dev eth2 proto kernel scope link src 10.10.40.100" 167 "10.10.40.0/24 dev eth2 proto kernel scope link src 10.10.40.100" {puts "old iproute2\n";}
168 "10.10.40.0/24 dev eth2 proto kernel scope link src 10.10.40.100" {puts "new iproute2\n";}
166} 169}
167 170
168send -- "ip route show\r" 171send -- "ip route show\r"
169expect { 172expect {
170 timeout {puts "TESTING ERROR 10.5\n";exit} 173 timeout {puts "TESTING ERROR 10.5\n";exit}
171 "10.10.50.0/24 dev eth3 proto kernel scope link" 174 "10.10.50.0/24 dev eth3 proto kernel scope link" {puts "old iproute2\n";}
175 "10.10.50.0/24 dev eth3 proto kernel scope link" {puts "new iproute2\n";}
172} 176}
173 177
174send -- "exit\r" 178send -- "exit\r"
diff --git a/test/network/interface.exp b/test/network/interface.exp
index bd8777c33..638e6d32b 100755
--- a/test/network/interface.exp
+++ b/test/network/interface.exp
@@ -27,8 +27,9 @@ expect {
27 "eth0.5" 27 "eth0.5"
28} 28}
29expect { 29expect {
30 timeout {puts "TESTING ERROR 2n";exit} 30 timeout {puts "TESTING ERROR 2\n";exit}
31 "Link" 31 "Link" {puts "old net-tools\n";}
32 "flags" {puts "new net-tools\n";}
32} 33}
33expect { 34expect {
34 timeout {puts "TESTING ERROR 3\n";exit} 35 timeout {puts "TESTING ERROR 3\n";exit}
@@ -47,7 +48,8 @@ expect {
47} 48}
48expect { 49expect {
49 timeout {puts "TESTING ERROR 6\n";exit} 50 timeout {puts "TESTING ERROR 6\n";exit}
50 "Link" 51 "Link" {puts "old net-tools\n";}
52 "flags" {puts "new net-tools\n";}
51} 53}
52expect { 54expect {
53 timeout {puts "TESTING ERROR 7\n";exit} 55 timeout {puts "TESTING ERROR 7\n";exit}
diff --git a/test/network/net_defaultgw.exp b/test/network/net_defaultgw.exp
index c7178616a..763eee38e 100755
--- a/test/network/net_defaultgw.exp
+++ b/test/network/net_defaultgw.exp
@@ -41,7 +41,8 @@ expect {
41send -- "ip route show\r" 41send -- "ip route show\r"
42expect { 42expect {
43 timeout {puts "TESTING ERROR 10.2\n";exit} 43 timeout {puts "TESTING ERROR 10.2\n";exit}
44 "10.10.20.0/29 dev eth0 proto kernel scope link" 44 "10.10.20.0/29 dev eth0 proto kernel scope link" {puts "old iproute2\n";}
45 "10.10.20.0/29 dev eth0 proto kernel scope link" {puts "new iproute2\n";}
45} 46}
46send -- "exit\r" 47send -- "exit\r"
47after 100 48after 100
diff --git a/test/network/net_defaultgw2.exp b/test/network/net_defaultgw2.exp
index 088dfeee8..e7483c921 100755
--- a/test/network/net_defaultgw2.exp
+++ b/test/network/net_defaultgw2.exp
@@ -29,13 +29,15 @@ expect {
29send -- "ip route show\r" 29send -- "ip route show\r"
30expect { 30expect {
31 timeout {puts "TESTING ERROR 10.2\n";exit} 31 timeout {puts "TESTING ERROR 10.2\n";exit}
32 "10.10.20.0/29 dev eth0 proto kernel scope link" 32 "10.10.20.0/29 dev eth0 proto kernel scope link" {puts "old iproute2\n";}
33 "10.10.20.0/29 dev eth0 proto kernel scope link" {puts "new iproute2\n";}
33} 34}
34 35
35send -- "ip route show\r" 36send -- "ip route show\r"
36expect { 37expect {
37 timeout {puts "TESTING ERROR 10.3\n";exit} 38 timeout {puts "TESTING ERROR 10.3\n";exit}
38 "10.10.30.0/24 dev eth1 proto kernel scope link" 39 "10.10.30.0/24 dev eth1 proto kernel scope link" {puts "old iproute2\n";}
40 "10.10.30.0/24 dev eth1 proto kernel scope link" {puts "new iproute2\n";}
39} 41}
40send -- "exit\r" 42send -- "exit\r"
41after 100 43after 100
diff --git a/test/network/net_ip.exp b/test/network/net_ip.exp
index c6b84781c..8ec676dd1 100755
--- a/test/network/net_ip.exp
+++ b/test/network/net_ip.exp
@@ -67,7 +67,8 @@ expect {
67send -- "ip route show\r" 67send -- "ip route show\r"
68expect { 68expect {
69 timeout {puts "TESTING ERROR 10\n";exit} 69 timeout {puts "TESTING ERROR 10\n";exit}
70 "10.10.20.0/29 dev eth0 proto kernel scope link" 70 "10.10.20.0/29 dev eth0 proto kernel scope link" {puts "old iproute2\n";}
71 "10.10.20.0/29 dev eth0 proto kernel scope link" {puts "new iproute2\n";}
71} 72}
72send -- "exit\r" 73send -- "exit\r"
73after 100 74after 100
diff --git a/test/network/net_profile.exp b/test/network/net_profile.exp
index febbcfcd7..b3bc9b441 100755
--- a/test/network/net_profile.exp
+++ b/test/network/net_profile.exp
@@ -38,13 +38,15 @@ sleep 1
38send -- "ip route show\r" 38send -- "ip route show\r"
39expect { 39expect {
40 timeout {puts "TESTING ERROR 1\n";exit} 40 timeout {puts "TESTING ERROR 1\n";exit}
41 "10.10.30.0/24 dev eth1 proto kernel scope link src 10.10.30.50" 41 "10.10.30.0/24 dev eth1 proto kernel scope link src 10.10.30.50" {puts "old iproute2\n";}
42 "10.10.30.0/24 dev eth1 proto kernel scope link src 10.10.30.50" {puts "new iproute2\n";}
42} 43}
43 44
44send -- "ip route show\r" 45send -- "ip route show\r"
45expect { 46expect {
46 timeout {puts "TESTING ERROR 2\n";exit} 47 timeout {puts "TESTING ERROR 2\n";exit}
47 "10.10.40.0/24 dev eth2 proto kernel scope link src 10.10.40.100" 48 "10.10.40.0/24 dev eth2 proto kernel scope link src 10.10.40.100" {puts "old iproute2\n";}
49 "10.10.40.0/24 dev eth2 proto kernel scope link src 10.10.40.100" {puts "new iproute2\n";}
48} 50}
49 51
50 52
generated by cgit v1.2.3-54-g00ecf (git 2.45.2) at 2024-06-26 09:52:09 +0000