From bf040105da2d89d421bd9f8fa686742485b526ee Mon Sep 17 00:00:00 2001 From: Bryan Boreham Date: Fri, 27 May 2016 13:15:32 +0100 Subject: [PATCH] Speed up smoke-tests by reducing timeout on 'docker stop' --- test/195_no_multicast_route_1_test.sh | 2 +- test/300_ip_reuse_test.sh | 4 ++-- test/500_weave_multi_cidr_test.sh | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/test/195_no_multicast_route_1_test.sh b/test/195_no_multicast_route_1_test.sh index 3dcf8d21..a0d38ad7 100755 --- a/test/195_no_multicast_route_1_test.sh +++ b/test/195_no_multicast_route_1_test.sh @@ -22,7 +22,7 @@ assert "show_multicast_route_on $HOST1 c2" assert "show_multicast_route_on $HOST1 c3" # Ensure current proxy options are obeyed on container start -docker_on $HOST1 stop c2 +docker_on $HOST1 stop -t 1 c2 weave_on $HOST1 stop-proxy weave_on $HOST1 launch-proxy diff --git a/test/300_ip_reuse_test.sh b/test/300_ip_reuse_test.sh index 324108c6..6369f1c8 100755 --- a/test/300_ip_reuse_test.sh +++ b/test/300_ip_reuse_test.sh @@ -19,11 +19,11 @@ start_container $HOST1 $C1/24 --name=c1 start_container $HOST1 $C2/24 --name=c2 check -docker_on $HOST1 stop c2 +docker_on $HOST1 stop -t 1 c2 start_container $HOST1 $C2/24 --name=c3 check -docker_on $HOST1 stop c3 +docker_on $HOST1 stop -t 1 c3 start_container $HOST1 $C3/24 --name=c4 weave_on $HOST1 attach $C2/24 c4 check diff --git a/test/500_weave_multi_cidr_test.sh b/test/500_weave_multi_cidr_test.sh index 0d6479cc..13a5c466 100755 --- a/test/500_weave_multi_cidr_test.sh +++ b/test/500_weave_multi_cidr_test.sh @@ -77,7 +77,7 @@ CID=$(start_container $HOST1 10.2.1.1/24 ip:10.2.2.1/24 net:10.2.3. assert_ips_and_dns $HOST1 $CID $NAME. 10.2.1.1/24 10.2.2.1/24 10.2.3.1/24 # Stop the container -docker_on $HOST1 stop $CID +docker_on $HOST1 stop -t 1 $CID assert_ips_and_dns $HOST1 $CID $NAME. # Restart with three IPs