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_arp.exp | 12 ++++++++---- test/network/4bridges_ip.exp | 12 ++++++++---- test/network/interface.exp | 8 +++++--- test/network/net_defaultgw.exp | 3 ++- test/network/net_defaultgw2.exp | 6 ++++-- test/network/net_ip.exp | 3 ++- test/network/net_profile.exp | 6 ++++-- 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 { 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.2\n";exit} - "10.10.30.0/24 dev eth1 proto kernel scope link" + "10.10.30.0/24 dev eth1 proto kernel scope link" {puts "old iproute2\n";} + "10.10.30.0/24 dev eth1 proto kernel scope link" {puts "new iproute2\n";} } send -- "ip route show\r" expect { timeout {puts "TESTING ERROR 10.2\n";exit} - "10.10.40.0/24 dev eth2 proto kernel scope link" + "10.10.40.0/24 dev eth2 proto kernel scope link" {puts "old iproute2\n";} + "10.10.40.0/24 dev eth2 proto kernel scope link" {puts "new iproute2\n";} } send -- "ip route show\r" expect { timeout {puts "TESTING ERROR 10.2\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" after 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 { 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" 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 { "eth0.5" } expect { - timeout {puts "TESTING ERROR 2n";exit} - "Link" + timeout {puts "TESTING ERROR 2\n";exit} + "Link" {puts "old net-tools\n";} + "flags" {puts "new net-tools\n";} } expect { timeout {puts "TESTING ERROR 3\n";exit} @@ -47,7 +48,8 @@ expect { } expect { timeout {puts "TESTING ERROR 6\n";exit} - "Link" + "Link" {puts "old net-tools\n";} + "flags" {puts "new net-tools\n";} } expect { 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 { 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 -- "exit\r" after 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 { 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" + "10.10.30.0/24 dev eth1 proto kernel scope link" {puts "old iproute2\n";} + "10.10.30.0/24 dev eth1 proto kernel scope link" {puts "new iproute2\n";} } send -- "exit\r" after 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 { send -- "ip route show\r" expect { timeout {puts "TESTING ERROR 10\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 -- "exit\r" after 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 send -- "ip route show\r" expect { timeout {puts "TESTING ERROR 1\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 2\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";} } -- cgit v1.2.3-54-g00ecf