Fix integration tests for swarm_manage changes

Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
This commit is contained in:
Andrea Luzzardi 2015-04-10 11:31:15 -07:00
parent b250a3a5cf
commit 258492faa7
4 changed files with 7 additions and 7 deletions

View File

@ -63,9 +63,9 @@ load helpers
# Additional parameters can be passed to the docker daemon: # Additional parameters can be passed to the docker daemon:
start_docker 1 --label foo=bar 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: # previously started by start_engine:
start_manager swarm_manage
# You can talk with said manager by using the docker_swarm helper: # You can talk with said manager by using the docker_swarm helper:
run docker_swarm info run docker_swarm info
@ -76,7 +76,7 @@ load helpers
# teardown is called at the end of every test. # teardown is called at the end of every test.
function teardown() { function teardown() {
# This will stop the swarm manager: # This will stop the swarm manager:
stop_manager swarm_manage_cleanup
# This will stop and remove all engines launched by the test: # This will stop and remove all engines launched by the test:
stop_docker stop_docker

View File

@ -3,7 +3,7 @@
load helpers load helpers
function teardown() { function teardown() {
stop_manager swarm_manage_cleanup
stop_docker stop_docker
} }

View File

@ -3,7 +3,7 @@
load helpers load helpers
function teardown() { function teardown() {
stop_manager swarm_manage_cleanup
stop_docker stop_docker
} }

View File

@ -3,13 +3,13 @@
load helpers load helpers
function teardown() { function teardown() {
stop_manager swarm_manage_cleanup
stop_docker stop_docker
} }
@test "docker should filter port in host mode correctly" { @test "docker should filter port in host mode correctly" {
start_docker 2 start_docker 2
start_manager swarm_manage
# #
# Use busybox to save image pulling time for integration test. # Use busybox to save image pulling time for integration test.