From 575aca9482de3a1d81dbf45fa7734de229858558 Mon Sep 17 00:00:00 2001 From: Reiner Herrmann Date: Mon, 17 Apr 2017 00:06:53 +0200 Subject: test: adapt output to newer versions of iproute2 and net-tools iproute2 now prevents output of double spaces --- test/network/4bridges_ip.exp | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'test/network/4bridges_ip.exp') 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 { send -- "ip route show\r" expect { timeout {puts "TESTING ERROR 10.2\n";exit} - "10.10.20.0/29 dev eth0 proto kernel scope link" + "10.10.20.0/29 dev eth0 proto kernel scope link" {puts "old iproute2\n";} + "10.10.20.0/29 dev eth0 proto kernel scope link" {puts "new iproute2\n";} } send -- "ip route show\r" expect { timeout {puts "TESTING ERROR 10.3\n";exit} - "10.10.30.0/24 dev eth1 proto kernel scope link src 10.10.30.50" + "10.10.30.0/24 dev eth1 proto kernel scope link src 10.10.30.50" {puts "old iproute2\n";} + "10.10.30.0/24 dev eth1 proto kernel scope link src 10.10.30.50" {puts "new iproute2\n";} } send -- "ip route show\r" expect { timeout {puts "TESTING ERROR 10.4\n";exit} - "10.10.40.0/24 dev eth2 proto kernel scope link src 10.10.40.100" + "10.10.40.0/24 dev eth2 proto kernel scope link src 10.10.40.100" {puts "old iproute2\n";} + "10.10.40.0/24 dev eth2 proto kernel scope link src 10.10.40.100" {puts "new iproute2\n";} } send -- "ip route show\r" expect { timeout {puts "TESTING ERROR 10.5\n";exit} - "10.10.50.0/24 dev eth3 proto kernel scope link" + "10.10.50.0/24 dev eth3 proto kernel scope link" {puts "old iproute2\n";} + "10.10.50.0/24 dev eth3 proto kernel scope link" {puts "new iproute2\n";} } send -- "exit\r" -- cgit v1.2.3-70-g09d2