From 88ff2baa96c8bcfe5406ba1e5edf51fef2bbbd3e Mon Sep 17 00:00:00 2001 From: Victor Vieux Date: Thu, 17 Sep 2015 15:26:10 -0700 Subject: [PATCH 1/2] fix race in tests Signed-off-by: Victor Vieux --- test/integration/port-filters.bats | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/test/integration/port-filters.bats b/test/integration/port-filters.bats index 5997addaee..8044ba6730 100644 --- a/test/integration/port-filters.bats +++ b/test/integration/port-filters.bats @@ -32,13 +32,13 @@ function teardown() { start_docker_with_busybox 2 swarm_manage - run docker_swarm run -d --expose=80 -p 80:80 busybox sh + run docker_swarm run --expose=80 -p 80:80 busybox echo 1 [ "$status" -eq 0 ] - run docker_swarm run -d --expose=80 -p 80:80 busybox sh + run docker_swarm run --expose=80 -p 80:80 busybox echo 2 [ "$status" -eq 0 ] # When trying to start the 3rd one, it should be error finding port 80. - run docker_swarm run -d --expose=80 -p 80:80 busybox sh + run docker_swarm run --expose=80 -p 80:80 busybox echo 3 [ "$status" -ne 0 ] [[ "${lines[0]}" == *"unable to find a node with port 80 available"* ]] From 068a587f17f9d00ea1dfaee74d9264cd7d18f9c5 Mon Sep 17 00:00:00 2001 From: Victor Vieux Date: Fri, 18 Sep 2015 03:06:14 -0700 Subject: [PATCH 2/2] fix issue with last docker Signed-off-by: Victor Vieux --- test/integration/resource_management.bats | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/integration/resource_management.bats b/test/integration/resource_management.bats index 953bf91de8..56985e1c68 100644 --- a/test/integration/resource_management.bats +++ b/test/integration/resource_management.bats @@ -63,7 +63,7 @@ function teardown() { run docker_swarm run -c 10240 busybox sh [ "$status" -ne 0 ] - [[ "${lines[0]}" == *"no resources available to schedule container"* ]] + [[ "${output}" == *"no resources available to schedule container"* ]] # The number of running containers should be still 0. run docker_swarm ps -a