testing

19 files changed, 34 insertions, 12 deletions

diff --git a/test/network/4bridges_arp.exp b/test/network/4bridges_arp.exp
index f769df43b..4ffa715cc 100755
--- a/test/network/4bridges_arp.exp
+++ b/test/network/4bridges_arp.exp
@@ -167,7 +167,8 @@ expect {
         timeout {puts "TESTING ERROR 10.2\n";exit}
         "10.10.50.0/24 dev eth3  proto kernel  scope link"
 }
-sleep 1
+send -- "exit\r"
+after 100
 
 puts "\nall done\n"
 
diff --git a/test/network/4bridges_ip.exp b/test/network/4bridges_ip.exp
index db7a61867..3cfd71be0 100755
--- a/test/network/4bridges_ip.exp
+++ b/test/network/4bridges_ip.exp
@@ -171,7 +171,8 @@ expect {
         "10.10.50.0/24 dev eth3  proto kernel  scope link"
 }
 
-sleep 1
+send -- "exit\r"
+after 100
 
 puts "\nall done\n"
 
diff --git a/test/network/bandwidth.exp b/test/network/bandwidth.exp
index 2913c6b14..8f3a706a8 100755
--- a/test/network/bandwidth.exp
+++ b/test/network/bandwidth.exp
@@ -60,6 +60,6 @@ expect {
         "rate 80Kbit burst 10Kb" {puts "TESTING ERROR 9\n";exit}
         "done"
 }
-sleep 1
+after 100
 
 puts "\nall done\n"
diff --git a/test/network/hostname.exp b/test/network/hostname.exp
index 53f24f7b1..73d06725f 100755
--- a/test/network/hostname.exp
+++ b/test/network/hostname.exp
@@ -23,6 +23,7 @@ expect {
         timeout {puts "TESTING ERROR 3\n";exit}
         "done"
 }
-sleep 1
+send -- "exit\r"
+after 100
 
 puts "all done\n"
diff --git a/test/network/ip6.exp b/test/network/ip6.exp
index e5939021e..f0fcebcf8 100755
--- a/test/network/ip6.exp
+++ b/test/network/ip6.exp
@@ -42,6 +42,8 @@ expect {
         "scopeid 0x0<global>" { puts "Arch\n"}
 }
 
+send -- "exit\r"
+after 100
 
 puts "\nall done\n"
 
diff --git a/test/network/net_badip.exp b/test/network/net_badip.exp
index 8003252d6..d13a6144e 100755
--- a/test/network/net_badip.exp
+++ b/test/network/net_badip.exp
@@ -13,7 +13,7 @@ expect {
         timeout {puts "TESTING ERROR 0.0\n";exit}
         "the IP address is not"
 }
-sleep 1
+after 100
 
 puts "\n"
 
diff --git a/test/network/net_defaultgw.exp b/test/network/net_defaultgw.exp
index 5534b7706..6291ae5ba 100755
--- a/test/network/net_defaultgw.exp
+++ b/test/network/net_defaultgw.exp
@@ -43,7 +43,8 @@ expect {
         timeout {puts "TESTING ERROR 10.2\n";exit}
         "10.10.20.0/29 dev eth0  proto kernel  scope link"
 }
-sleep 1
+send -- "exit\r"
+after 100
 
 puts "\nall done\n"
 
diff --git a/test/network/net_defaultgw2.exp b/test/network/net_defaultgw2.exp
index 86f204e8c..7620e4899 100755
--- a/test/network/net_defaultgw2.exp
+++ b/test/network/net_defaultgw2.exp
@@ -37,7 +37,8 @@ expect {
         timeout {puts "TESTING ERROR 10.3\n";exit}
         "10.10.30.0/24 dev eth1  proto kernel  scope link"
 }
-sleep 1
+send -- "exit\r"
+after 100
 
 puts "\nall done\n"
 
diff --git a/test/network/net_defaultgw3.exp b/test/network/net_defaultgw3.exp
index 30150938f..a47324adc 100755
--- a/test/network/net_defaultgw3.exp
+++ b/test/network/net_defaultgw3.exp
@@ -14,7 +14,8 @@ expect {
         "default gateway 10.10.95.89 is not in the range of any network"
 }
 
-sleep 1
+after 100
+
 
 puts "\n"
 
diff --git a/test/network/net_interface.exp b/test/network/net_interface.exp
index 2e6619938..2f87024d8 100755
--- a/test/network/net_interface.exp
+++ b/test/network/net_interface.exp
@@ -86,6 +86,8 @@ expect {
         timeout {puts "TESTING ERROR 5.1\n";exit}
         "UP"
 }
+send -- "exit\r"
+after 100
 
 puts "all done\n"
 
diff --git a/test/network/net_ip.exp b/test/network/net_ip.exp
index 0eff212dd..32103050d 100755
--- a/test/network/net_ip.exp
+++ b/test/network/net_ip.exp
@@ -69,7 +69,8 @@ expect {
         timeout {puts "TESTING ERROR 10\n";exit}
         "10.10.20.0/29 dev eth0  proto kernel  scope link"
 }
-sleep 1
+send -- "exit\r"
+after 100
 
 puts "\n"
 
diff --git a/test/network/net_local.exp b/test/network/net_local.exp
index 60ab2af05..b72b9adaf 100755
--- a/test/network/net_local.exp
+++ b/test/network/net_local.exp
@@ -43,6 +43,8 @@ expect {
         timeout {puts "TESTING ERROR 7\n";exit}
         "255.0.0.0"
 }
+send -- "exit\r"
+after 100
 
 puts "all done\n"
 
diff --git a/test/network/net_mac.exp b/test/network/net_mac.exp
index 5c48be9fd..d3cd8163f 100755
--- a/test/network/net_mac.exp
+++ b/test/network/net_mac.exp
@@ -33,7 +33,8 @@ expect {
         timeout {puts "TESTING ERROR 4\n";exit}
         "Child process initialized"
 }
-sleep 1
+send -- "exit\r"
+after 100
 
 puts "\nall done\n"
 
diff --git a/test/network/net_macvlan.exp b/test/network/net_macvlan.exp
index ca503c26a..f457ea98f 100755
--- a/test/network/net_macvlan.exp
+++ b/test/network/net_macvlan.exp
@@ -86,6 +86,8 @@ while { $i <= $MAXi } {
         after 100
 #       sleep 1
 }
+send -- "exit\r"
+after 100
 
 puts "\n"
 
diff --git a/test/network/net_mtu.exp b/test/network/net_mtu.exp
index 21b9aa5cb..eb9c5d08c 100755
--- a/test/network/net_mtu.exp
+++ b/test/network/net_mtu.exp
@@ -28,6 +28,8 @@ expect {
         timeout {puts "TESTING ERROR 4\n";exit}
         "state UP"
 }
+send -- "exit\r"
+after 100
 
 puts "\nall done\n"
 
diff --git a/test/network/net_noip.exp b/test/network/net_noip.exp
index 3fb53d860..b557d116c 100755
--- a/test/network/net_noip.exp
+++ b/test/network/net_noip.exp
@@ -38,6 +38,7 @@ expect {
         timeout {puts "TESTING ERROR 6\n";exit}
         "done"
 }
+send -- "exit\r"
 after 100
 
 puts "all done\n"
diff --git a/test/network/net_noip2.exp b/test/network/net_noip2.exp
index cf86d7f6b..c86ea4900 100755
--- a/test/network/net_noip2.exp
+++ b/test/network/net_noip2.exp
@@ -38,6 +38,7 @@ expect {
         timeout {puts "TESTING ERROR 6\n";exit}
         "done"
 }
+send -- "exit\r"
 after 100
 
 puts "all done\n"
diff --git a/test/network/net_none.exp b/test/network/net_none.exp
index 1c1577d76..1761eb423 100755
--- a/test/network/net_none.exp
+++ b/test/network/net_none.exp
@@ -66,6 +66,7 @@ expect {
         "eth0" {puts "TESTING ERROR 5.1\n";exit}
         "done"
 }
-sleep 1
+send -- "exit\r"
+after 100
 
 puts "\nall done\n"
diff --git a/test/network/net_profile.exp b/test/network/net_profile.exp
index 7e88193cc..dee0b2793 100755
--- a/test/network/net_profile.exp
+++ b/test/network/net_profile.exp
@@ -70,7 +70,8 @@ expect {
         "state UP"
 }
 
-sleep 1
+send -- "exit\r"
+after 100
 
 puts "\nall done\n"