From 9a6d0c9cf52b0a348cfd3a3677eac15c26ce4667 Mon Sep 17 00:00:00 2001 From: Bryan Boreham Date: Fri, 1 Nov 2019 16:46:01 +0000 Subject: [PATCH] Remove the need for a third host in test 320 This was necessary when we didn't have ipam persistence, as the comment said "to remember the IPAM CRDT when we stop host2". But we have persistence to hold the CRDT so we don't need host3. Rename the test so the test runner only gives it 2 hosts. --- test/{320_claim_3_test.sh => 320_claim_2_test.sh} | 12 ------------ 1 file changed, 12 deletions(-) rename test/{320_claim_3_test.sh => 320_claim_2_test.sh} (85%) diff --git a/test/320_claim_3_test.sh b/test/320_claim_2_test.sh similarity index 85% rename from test/320_claim_3_test.sh rename to test/320_claim_2_test.sh index 92bab20e..15c5fb5b 100755 --- a/test/320_claim_3_test.sh +++ b/test/320_claim_2_test.sh @@ -44,20 +44,8 @@ assert_raises "exec_on $HOST1 c1 $PING $C3" stop_weave_on $HOST1 stop_weave_on $HOST2 -delete_persistence $HOST1 $HOST2 - # Now make host1 attempt to claim from host2, when host2 is stopped # the point being to check whether host1 will hang trying to talk to host2 -weave_on $HOST2 launch --ipalloc-range $UNIVERSE -weave_on $HOST2 prime -# Introduce host3 to remember the IPAM CRDT when we stop host2 -weave_on $HOST3 launch --ipalloc-range $UNIVERSE $HOST2 -weave_on $HOST3 prime -stop_weave_on $HOST2 -weave_on $HOST1 launch --ipalloc-range $UNIVERSE $HOST3 - -stop_weave_on $HOST1 -stop_weave_on $HOST3 # Delete persistence data on host1, so that host1 would try to establish a ring. delete_persistence $HOST1