reweave/weave
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch '1.8'

Browse Source
This commit is contained in:
Adam Harrison committed 2016-11-22 16:17:30 +00:00
2 parents ef270764f3 664ba8735f
commit c3a2539445
2 files changed
+9 -7
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

test/830_cni_plugin_test.sh
+4 -2
View File
@@ -45,7 +45,7 @@ C2IP=$(container_ip $HOST1 c2)
assert_raises "exec_on $HOST1 c1 $PING $C2IP"
assert_raises "exec_on $HOST1 c2 $PING $C1IP"
# Now remove and start a new container to see if IP address re-use breaks things
# Now remove and start a new container to see if anything breaks
docker_on $HOST1 rm -f c2
C3=$(docker_on $HOST1 run --net=none --name=c3 -dt $SMALL_IMAGE /bin/sh)
@@ -56,7 +56,9 @@ EOF
C3IP=$(container_ip $HOST1 c3)
assert_raises "exec_on $HOST1 c1 $PING $C2IP"
# CNI shouldn't re-use the address until we call DEL
assert_raises "[ $C2IP != $C3IP ]"
assert_raises "exec_on $HOST1 c1 $PING $C3IP"
# Ensure existing containers can reclaim their IP addresses after CNI has been used -- see #2548