Speed up smoke-tests by reducing timeout on 'docker stop'

This commit is contained in:
Bryan Boreham committed 2016-05-27 13:15:32 +01:00
1 parent 7300c33793
commit bf040105da
3 files changed
+4 -4

No files matched your search

+1 -1
View File
@@ -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
+2 -2
View File
@@ -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
+1 -1
View File
@@ -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