From 258492faa734f1d410c4d706bdddac6d93796ae6 Mon Sep 17 00:00:00 2001
From: Andrea Luzzardi <aluzzardi@gmail.com>
Date: Fri, 10 Apr 2015 11:31:15 -0700
Subject: [PATCH] Fix integration tests for swarm_manage changes

Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
---
 test/integration/README.md        | 6 +++---
 test/integration/api.bats         | 2 +-
 test/integration/constraints.bats | 2 +-
 test/integration/port-filter.bats | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/test/integration/README.md b/test/integration/README.md
index fe7906120d..696a6db9c7 100644
--- a/test/integration/README.md
+++ b/test/integration/README.md
@@ -63,9 +63,9 @@ load helpers
 	# Additional parameters can be passed to the docker daemon:
 	start_docker 1 --label foo=bar
 
-	# start_manager will start the swarm manager, preconfigured with all engines
+	# swarm_manage will start the swarm manager, preconfigured with all engines
 	# previously started by start_engine:
-	start_manager
+	swarm_manage
 
 	# You can talk with said manager by using the docker_swarm helper:
 	run docker_swarm info
@@ -76,7 +76,7 @@ load helpers
 # teardown is called at the end of every test.
 function teardown() {
 	# This will stop the swarm manager:
-	stop_manager
+	swarm_manage_cleanup
 
 	# This will stop and remove all engines launched by the test:
 	stop_docker
diff --git a/test/integration/api.bats b/test/integration/api.bats
index 85ed9ce876..80f58debd8 100644
--- a/test/integration/api.bats
+++ b/test/integration/api.bats
@@ -3,7 +3,7 @@
 load helpers
 
 function teardown() {
-	stop_manager
+	swarm_manage_cleanup
 	stop_docker
 }
 
diff --git a/test/integration/constraints.bats b/test/integration/constraints.bats
index 047efaa789..186316bd84 100644
--- a/test/integration/constraints.bats
+++ b/test/integration/constraints.bats
@@ -3,7 +3,7 @@
 load helpers
 
 function teardown() {
-	stop_manager
+	swarm_manage_cleanup
 	stop_docker
 }
 
diff --git a/test/integration/port-filter.bats b/test/integration/port-filter.bats
index 9e2deedc75..3aec73b7c8 100644
--- a/test/integration/port-filter.bats
+++ b/test/integration/port-filter.bats
@@ -3,13 +3,13 @@
 load helpers
 
 function teardown() {
-	stop_manager
+	swarm_manage_cleanup
 	stop_docker
 }
 
 @test "docker should filter port in host mode correctly" {
 	start_docker 2
-	start_manager
+	swarm_manage
 
 	#
 	# Use busybox to save image pulling time for integration test.