From 76601fed0963b076fd0ea51b86bb2479e76112cf Mon Sep 17 00:00:00 2001 From: Bryan Boreham Date: Mon, 25 Apr 2016 12:28:47 +0100 Subject: [PATCH] Fix up merge in unit test --- ipam/allocator_test.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ipam/allocator_test.go b/ipam/allocator_test.go index 8a6f48ad..0b5b59a3 100644 --- a/ipam/allocator_test.go +++ b/ipam/allocator_test.go @@ -329,8 +329,8 @@ func TestNoFrag(t *testing.T) { resultChan := make(chan int) for i := 0; i < 100; i++ { allocs, router, subnet := makeNetworkOfAllocators(3, cidr) - allocs[1].Allocate("foo", subnet, returnFalse) - allocs[2].Allocate("bar", subnet, returnFalse) + allocs[1].Allocate("foo", subnet, true, returnFalse) + allocs[2].Allocate("bar", subnet, true, returnFalse) allocs[2].actionChan <- func() { resultChan <- len(allocs[2].ring.Entries) }