From bb8a745431f39ceac99dab7bce0f1c2f49914cc1 Mon Sep 17 00:00:00 2001 From: Matthias Radestock Date: Sat, 16 May 2015 19:05:19 +0100 Subject: [PATCH] cosmetic: helper functions come first --- test/500_weave_multi_cidr_test.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/test/500_weave_multi_cidr_test.sh b/test/500_weave_multi_cidr_test.sh index 989919c4..43f44fed 100755 --- a/test/500_weave_multi_cidr_test.sh +++ b/test/500_weave_multi_cidr_test.sh @@ -2,11 +2,6 @@ . ./config.sh -start_suite "Weave run/start/attach/detach with multiple cidr arguments" - -weave_on $HOST1 launch -weave_on $HOST1 launch-dns 10.254.254.254/24 - # assert_container_cidrs [ ...] assert_container_cidrs() { HOST=$1; shift @@ -43,6 +38,11 @@ assert_bridge_cidrs() { assert "echo $BRIDGE_CIDRS" "$CIDRS" } +start_suite "Weave run/start/attach/detach with multiple cidr arguments" + +weave_on $HOST1 launch +weave_on $HOST1 launch-dns 10.254.254.254/24 + # Run container with three cidrs CID=$(weave_on $HOST1 run 10.2.1.1/24 10.2.2.1/24 10.2.3.1/24 -t --name multicidr -h multicidr.weave.local gliderlabs/alpine /bin/sh | cut -b 1-12) assert_container_cidrs $HOST1 $CID 10.2.1.1/24 10.2.2.1/24 10.2.3.1/24