From e355e50c0d660e0f386b7d044261fd1e11c0f15c Mon Sep 17 00:00:00 2001
From: Adam Harrison <harrisonadamw@gmail.com>
Date: Tue, 12 Apr 2016 15:15:35 +0100
Subject: [PATCH] Tests prefer --ipalloc-init

---
 test/340_observers_cannot_vote_3_test.sh       | 6 +++---
 test/350_observers_can_call_election_3_test.sh | 6 +++---
 test/380_ipam_seed_2_test.sh                   | 4 ++--
 test/510_detach_hide_no_ipalloc.sh             | 2 +-
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/test/340_observers_cannot_vote_3_test.sh b/test/340_observers_cannot_vote_3_test.sh
index 08d1b06f..2670b407 100755
--- a/test/340_observers_cannot_vote_3_test.sh
+++ b/test/340_observers_cannot_vote_3_test.sh
@@ -5,14 +5,14 @@
 start_suite "Observers can't vote"
 
 # Start network that doesn't have enough peers for consensus
-weave_on $HOST1 launch --init-peer-count=2
-weave_on $HOST2 launch --observer $HOST1
+weave_on $HOST1 launch --ipalloc-init consensus=2
+weave_on $HOST2 launch --ipalloc-init observer $HOST1
 
 # Check that an allocation times out
 assert_raises "timeout 2 cat <( start_container $HOST1 )" 124
 
 # Add another elector
-weave_on $HOST3	launch --init-peer-count=2 $HOST2
+weave_on $HOST3	launch --ipalloc-init consensus=2 $HOST2
 
 # Check allocation succeeds
 assert_raises "timeout 10 cat <( start_container $HOST1 )"
diff --git a/test/350_observers_can_call_election_3_test.sh b/test/350_observers_can_call_election_3_test.sh
index e6604e2b..af058e62 100755
--- a/test/350_observers_can_call_election_3_test.sh
+++ b/test/350_observers_can_call_election_3_test.sh
@@ -5,11 +5,11 @@
 start_suite "Observers can call election"
 
 # Start network with sufficient voters for consensus
-weave_on $HOST1 launch --init-peer-count=2
-weave_on $HOST2 launch --init-peer-count=2 $HOST1
+weave_on $HOST1 launch --ipalloc-init consensus=2
+weave_on $HOST2 launch --ipalloc-init consensus=2 $HOST1
 
 # Add an observer
-weave_on $HOST3 launch --observer $HOST2
+weave_on $HOST3 launch --ipalloc-init observer $HOST2
 
 # Wait for network to settle; ensure IPAM is idle (blank output = no consensus)
 sleep 5
diff --git a/test/380_ipam_seed_2_test.sh b/test/380_ipam_seed_2_test.sh
index f380a0c0..3f18b41b 100755
--- a/test/380_ipam_seed_2_test.sh
+++ b/test/380_ipam_seed_2_test.sh
@@ -5,8 +5,8 @@
 start_suite "Specify initial IPAM seed"
 
 # Launch two disconnected routers
-weave_on $HOST1 launch --name ::1 --ipam-seed ::1,::2
-weave_on $HOST2 launch --name ::2 --ipam-seed ::1,::2
+weave_on $HOST1 launch --name ::1 --ipalloc-init seed=::1,::2
+weave_on $HOST2 launch --name ::2 --ipalloc-init seed=::1,::2
 
 # Ensure allocations can proceed
 assert_raises "timeout 10 cat <( start_container $HOST1 --name c1)"
diff --git a/test/510_detach_hide_no_ipalloc.sh b/test/510_detach_hide_no_ipalloc.sh
index 748e87bc..720e9eb3 100755
--- a/test/510_detach_hide_no_ipalloc.sh
+++ b/test/510_detach_hide_no_ipalloc.sh
@@ -11,7 +11,7 @@ check() {
 
 start_suite "'detach' and 'hide' do not require IP allocation"
 
-weave_on $HOST1 launch --ipalloc-range $UNIVERSE --init-peer-count=2
+weave_on $HOST1 launch --ipalloc-range $UNIVERSE --ipalloc-init consensus=2
 
 start_container $HOST1 10.2.1.1/24 --name=c1
 check detach           10.2.1.1/24 c1