diff options
author | Fred Barclay <Fred-Barclay@users.noreply.github.com> | 2017-05-24 14:38:01 -0500 |
---|---|---|
committer | Fred Barclay <Fred-Barclay@users.noreply.github.com> | 2017-05-24 14:38:01 -0500 |
commit | 997a93efbdcbbaeed517e0bdc5283e9d8b31f422 (patch) | |
tree | cbb47fb1b41ced351501686e3fdf9aaf46b31414 /test/network | |
parent | Remove trailing whitespace from platform (diff) | |
download | firejail-997a93efbdcbbaeed517e0bdc5283e9d8b31f422.tar.gz firejail-997a93efbdcbbaeed517e0bdc5283e9d8b31f422.tar.zst firejail-997a93efbdcbbaeed517e0bdc5283e9d8b31f422.zip |
strip trailing whitespace from test/
Diffstat (limited to 'test/network')
-rwxr-xr-x | test/network/4bridges_arp.exp | 1 | ||||
-rwxr-xr-x | test/network/4bridges_ip.exp | 1 | ||||
-rwxr-xr-x | test/network/configure | 3 | ||||
-rwxr-xr-x | test/network/firemon-interfaces.exp | 1 | ||||
-rwxr-xr-x | test/network/ip6.exp | 1 | ||||
-rwxr-xr-x | test/network/iprange.exp | 1 | ||||
-rw-r--r-- | test/network/net-profile.profile | 1 | ||||
-rwxr-xr-x | test/network/net_badip.exp | 1 | ||||
-rwxr-xr-x | test/network/net_defaultgw.exp | 1 | ||||
-rwxr-xr-x | test/network/net_defaultgw2.exp | 1 | ||||
-rwxr-xr-x | test/network/net_defaultgw3.exp | 1 | ||||
-rwxr-xr-x | test/network/net_ip.exp | 1 | ||||
-rwxr-xr-x | test/network/net_local.exp | 1 | ||||
-rwxr-xr-x | test/network/net_mac.exp | 1 | ||||
-rwxr-xr-x | test/network/net_macvlan2.exp | 1 | ||||
-rwxr-xr-x | test/network/net_mtu.exp | 1 | ||||
-rwxr-xr-x | test/network/net_netfilter.exp | 1 | ||||
-rwxr-xr-x | test/network/net_noip.exp | 1 | ||||
-rwxr-xr-x | test/network/net_noip2.exp | 1 | ||||
-rwxr-xr-x | test/network/net_profile.exp | 1 | ||||
-rwxr-xr-x | test/network/net_scan.exp | 3 | ||||
-rwxr-xr-x | test/network/net_veth.exp | 1 | ||||
-rwxr-xr-x | test/network/netstats.exp | 1 | ||||
-rwxr-xr-x | test/network/veth-name.exp | 3 |
24 files changed, 3 insertions, 27 deletions
diff --git a/test/network/4bridges_arp.exp b/test/network/4bridges_arp.exp index e84ec719c..88b06ee3d 100755 --- a/test/network/4bridges_arp.exp +++ b/test/network/4bridges_arp.exp | |||
@@ -175,4 +175,3 @@ send -- "exit\r" | |||
175 | after 100 | 175 | after 100 |
176 | 176 | ||
177 | puts "\nall done\n" | 177 | puts "\nall done\n" |
178 | |||
diff --git a/test/network/4bridges_ip.exp b/test/network/4bridges_ip.exp index 74a1e5d68..5ecf3ecb8 100755 --- a/test/network/4bridges_ip.exp +++ b/test/network/4bridges_ip.exp | |||
@@ -179,4 +179,3 @@ send -- "exit\r" | |||
179 | after 100 | 179 | after 100 |
180 | 180 | ||
181 | puts "\nall done\n" | 181 | puts "\nall done\n" |
182 | |||
diff --git a/test/network/configure b/test/network/configure index d4511c705..9d47fe69e 100755 --- a/test/network/configure +++ b/test/network/configure | |||
@@ -9,7 +9,7 @@ ifconfig br0 10.10.20.1/29 up | |||
9 | iptables -t nat -A POSTROUTING -o eth0 -s 10.10.20.0/29 -j MASQUERADE | 9 | iptables -t nat -A POSTROUTING -o eth0 -s 10.10.20.0/29 -j MASQUERADE |
10 | # port forwarding | 10 | # port forwarding |
11 | # iptables -t nat -A PREROUTING -p tcp --dport 80 -j DNAT --to 10.10.20.2:80 | 11 | # iptables -t nat -A PREROUTING -p tcp --dport 80 -j DNAT --to 10.10.20.2:80 |
12 | 12 | ||
13 | brctl addbr br1 | 13 | brctl addbr br1 |
14 | ifconfig br1 10.10.30.1/24 up | 14 | ifconfig br1 10.10.30.1/24 up |
15 | brctl addbr br2 | 15 | brctl addbr br2 |
@@ -27,4 +27,3 @@ ip link add link eth0 name eth0.7 type vlan id 7 | |||
27 | 27 | ||
28 | # network namespace | 28 | # network namespace |
29 | ip netns add red | 29 | ip netns add red |
30 | |||
diff --git a/test/network/firemon-interfaces.exp b/test/network/firemon-interfaces.exp index 7a95ccb18..f70d64dce 100755 --- a/test/network/firemon-interfaces.exp +++ b/test/network/firemon-interfaces.exp | |||
@@ -64,4 +64,3 @@ expect { | |||
64 | after 100 | 64 | after 100 |
65 | 65 | ||
66 | puts "\n" | 66 | puts "\n" |
67 | |||
diff --git a/test/network/ip6.exp b/test/network/ip6.exp index d03cb7c37..26780e167 100755 --- a/test/network/ip6.exp +++ b/test/network/ip6.exp | |||
@@ -86,4 +86,3 @@ send -- "exit\r" | |||
86 | after 100 | 86 | after 100 |
87 | 87 | ||
88 | puts "\nall done\n" | 88 | puts "\nall done\n" |
89 | |||
diff --git a/test/network/iprange.exp b/test/network/iprange.exp index d37a44e4f..c8a96b560 100755 --- a/test/network/iprange.exp +++ b/test/network/iprange.exp | |||
@@ -100,4 +100,3 @@ after 100 | |||
100 | after 100 | 100 | after 100 |
101 | 101 | ||
102 | puts "\nall done\n" | 102 | puts "\nall done\n" |
103 | |||
diff --git a/test/network/net-profile.profile b/test/network/net-profile.profile index 05052b6dc..89e431939 100644 --- a/test/network/net-profile.profile +++ b/test/network/net-profile.profile | |||
@@ -7,4 +7,3 @@ net br2 | |||
7 | ip 10.10.40.100 | 7 | ip 10.10.40.100 |
8 | net br3 | 8 | net br3 |
9 | defaultgw 10.10.20.2 | 9 | defaultgw 10.10.20.2 |
10 | |||
diff --git a/test/network/net_badip.exp b/test/network/net_badip.exp index 2467b3ef2..54f1858ca 100755 --- a/test/network/net_badip.exp +++ b/test/network/net_badip.exp | |||
@@ -16,4 +16,3 @@ expect { | |||
16 | after 100 | 16 | after 100 |
17 | 17 | ||
18 | puts "\n" | 18 | puts "\n" |
19 | |||
diff --git a/test/network/net_defaultgw.exp b/test/network/net_defaultgw.exp index 763eee38e..1eee2c252 100755 --- a/test/network/net_defaultgw.exp +++ b/test/network/net_defaultgw.exp | |||
@@ -48,4 +48,3 @@ send -- "exit\r" | |||
48 | after 100 | 48 | after 100 |
49 | 49 | ||
50 | puts "\nall done\n" | 50 | puts "\nall done\n" |
51 | |||
diff --git a/test/network/net_defaultgw2.exp b/test/network/net_defaultgw2.exp index e7483c921..58f8f9edd 100755 --- a/test/network/net_defaultgw2.exp +++ b/test/network/net_defaultgw2.exp | |||
@@ -43,4 +43,3 @@ send -- "exit\r" | |||
43 | after 100 | 43 | after 100 |
44 | 44 | ||
45 | puts "\nall done\n" | 45 | puts "\nall done\n" |
46 | |||
diff --git a/test/network/net_defaultgw3.exp b/test/network/net_defaultgw3.exp index bf5d00b34..7762e98d6 100755 --- a/test/network/net_defaultgw3.exp +++ b/test/network/net_defaultgw3.exp | |||
@@ -18,4 +18,3 @@ after 100 | |||
18 | 18 | ||
19 | 19 | ||
20 | puts "\n" | 20 | puts "\n" |
21 | |||
diff --git a/test/network/net_ip.exp b/test/network/net_ip.exp index 8ec676dd1..a8cf08a86 100755 --- a/test/network/net_ip.exp +++ b/test/network/net_ip.exp | |||
@@ -74,4 +74,3 @@ send -- "exit\r" | |||
74 | after 100 | 74 | after 100 |
75 | 75 | ||
76 | puts "\n" | 76 | puts "\n" |
77 | |||
diff --git a/test/network/net_local.exp b/test/network/net_local.exp index 4e0cef329..b724ce5d4 100755 --- a/test/network/net_local.exp +++ b/test/network/net_local.exp | |||
@@ -47,4 +47,3 @@ send -- "exit\r" | |||
47 | after 100 | 47 | after 100 |
48 | 48 | ||
49 | puts "all done\n" | 49 | puts "all done\n" |
50 | |||
diff --git a/test/network/net_mac.exp b/test/network/net_mac.exp index dd3391d8e..d2aa19503 100755 --- a/test/network/net_mac.exp +++ b/test/network/net_mac.exp | |||
@@ -37,4 +37,3 @@ send -- "exit\r" | |||
37 | after 100 | 37 | after 100 |
38 | 38 | ||
39 | puts "\nall done\n" | 39 | puts "\nall done\n" |
40 | |||
diff --git a/test/network/net_macvlan2.exp b/test/network/net_macvlan2.exp index b6cab7c7b..334eb448e 100755 --- a/test/network/net_macvlan2.exp +++ b/test/network/net_macvlan2.exp | |||
@@ -40,4 +40,3 @@ sleep 1 | |||
40 | after 100 | 40 | after 100 |
41 | 41 | ||
42 | puts "\nall done\n" | 42 | puts "\nall done\n" |
43 | |||
diff --git a/test/network/net_mtu.exp b/test/network/net_mtu.exp index 6748d9ec5..9436f5cc5 100755 --- a/test/network/net_mtu.exp +++ b/test/network/net_mtu.exp | |||
@@ -32,4 +32,3 @@ send -- "exit\r" | |||
32 | after 100 | 32 | after 100 |
33 | 33 | ||
34 | puts "\nall done\n" | 34 | puts "\nall done\n" |
35 | |||
diff --git a/test/network/net_netfilter.exp b/test/network/net_netfilter.exp index 3c43a481f..52fd3bf11 100755 --- a/test/network/net_netfilter.exp +++ b/test/network/net_netfilter.exp | |||
@@ -88,4 +88,3 @@ send -- "exit\r" | |||
88 | after 100 | 88 | after 100 |
89 | 89 | ||
90 | puts "all done\n" | 90 | puts "all done\n" |
91 | |||
diff --git a/test/network/net_noip.exp b/test/network/net_noip.exp index dfe0abb66..9a73f618a 100755 --- a/test/network/net_noip.exp +++ b/test/network/net_noip.exp | |||
@@ -42,4 +42,3 @@ send -- "exit\r" | |||
42 | after 100 | 42 | after 100 |
43 | 43 | ||
44 | puts "all done\n" | 44 | puts "all done\n" |
45 | |||
diff --git a/test/network/net_noip2.exp b/test/network/net_noip2.exp index b6f725523..c01f2e4f4 100755 --- a/test/network/net_noip2.exp +++ b/test/network/net_noip2.exp | |||
@@ -42,4 +42,3 @@ send -- "exit\r" | |||
42 | after 100 | 42 | after 100 |
43 | 43 | ||
44 | puts "all done\n" | 44 | puts "all done\n" |
45 | |||
diff --git a/test/network/net_profile.exp b/test/network/net_profile.exp index b3bc9b441..801fc4dfa 100755 --- a/test/network/net_profile.exp +++ b/test/network/net_profile.exp | |||
@@ -76,4 +76,3 @@ send -- "exit\r" | |||
76 | after 100 | 76 | after 100 |
77 | 77 | ||
78 | puts "\nall done\n" | 78 | puts "\nall done\n" |
79 | |||
diff --git a/test/network/net_scan.exp b/test/network/net_scan.exp index bb46f9c60..84893cf9c 100755 --- a/test/network/net_scan.exp +++ b/test/network/net_scan.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 | # | 10 | # |
11 | send -- "firejail --net=br1 --ip=10.10.30.50\r" | 11 | send -- "firejail --net=br1 --ip=10.10.30.50\r" |
12 | expect { | 12 | expect { |
13 | timeout {puts "TESTING ERROR 0\n";exit} | 13 | timeout {puts "TESTING ERROR 0\n";exit} |
@@ -72,4 +72,3 @@ sleep 1 | |||
72 | after 100 | 72 | after 100 |
73 | 73 | ||
74 | puts "\nall done\n" | 74 | puts "\nall done\n" |
75 | |||
diff --git a/test/network/net_veth.exp b/test/network/net_veth.exp index e31f5da55..62e41fcfc 100755 --- a/test/network/net_veth.exp +++ b/test/network/net_veth.exp | |||
@@ -139,4 +139,3 @@ expect { | |||
139 | after 100 | 139 | after 100 |
140 | 140 | ||
141 | puts "\n" | 141 | puts "\n" |
142 | |||
diff --git a/test/network/netstats.exp b/test/network/netstats.exp index 2e6649ae3..e9ca4e027 100755 --- a/test/network/netstats.exp +++ b/test/network/netstats.exp | |||
@@ -36,4 +36,3 @@ expect { | |||
36 | after 100 | 36 | after 100 |
37 | 37 | ||
38 | puts "\n" | 38 | puts "\n" |
39 | |||
diff --git a/test/network/veth-name.exp b/test/network/veth-name.exp index ccfb208ff..a9aeac9ae 100755 --- a/test/network/veth-name.exp +++ b/test/network/veth-name.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 | # | 10 | # |
11 | send -- "firejail --net=br1 --ip=10.10.30.50 --veth-name=blablabla\r" | 11 | send -- "firejail --net=br1 --ip=10.10.30.50 --veth-name=blablabla\r" |
12 | expect { | 12 | expect { |
13 | timeout {puts "TESTING ERROR 0\n";exit} | 13 | timeout {puts "TESTING ERROR 0\n";exit} |
@@ -74,4 +74,3 @@ sleep 1 | |||
74 | 74 | ||
75 | after 100 | 75 | after 100 |
76 | puts "\nall done\n" | 76 | puts "\nall done\n" |
77 | |||