From 838aab1d341065e240ca59fa7b80f183b7cf13b7 Mon Sep 17 00:00:00 2001 From: Alexandre Beslic Date: Tue, 26 May 2015 18:33:10 -0700 Subject: [PATCH] Add node back to the cluster after Node Removal test (after regression on zookeeper) Signed-off-by: Alexandre Beslic --- test/integration/discovery/consul.bats | 5 +++++ test/integration/discovery/etcd.bats | 5 +++++ test/integration/discovery/zk.bats | 5 +++++ 3 files changed, 15 insertions(+) diff --git a/test/integration/discovery/consul.bats b/test/integration/discovery/consul.bats index 5764324bd2..dcfdbf14a6 100644 --- a/test/integration/discovery/consul.bats +++ b/test/integration/discovery/consul.bats @@ -81,6 +81,11 @@ function teardown() { # Check if previously registered engines are all gone retry 30 1 discovery_check_swarm_info 0 + + # Check that we can add instances back to the cluster + start_docker 2 + swarm_join "$DISCOVERY" + retry 5 1 discovery_check_swarm_info 2 } @test "consul discovery: failure" { diff --git a/test/integration/discovery/etcd.bats b/test/integration/discovery/etcd.bats index 9d6f3836e2..ac2830b563 100644 --- a/test/integration/discovery/etcd.bats +++ b/test/integration/discovery/etcd.bats @@ -86,6 +86,11 @@ function teardown() { # Check if previously registered engines are all gone retry 15 1 discovery_check_swarm_info 0 + + # Check that we can add instances back to the cluster + start_docker 2 + swarm_join "$DISCOVERY" + retry 5 1 discovery_check_swarm_info 2 } @test "etcd discovery: failure" { diff --git a/test/integration/discovery/zk.bats b/test/integration/discovery/zk.bats index 5dbd9aef84..6fd5f256a1 100644 --- a/test/integration/discovery/zk.bats +++ b/test/integration/discovery/zk.bats @@ -81,6 +81,11 @@ function teardown() { # Check if previously registered engines are all gone retry 20 1 discovery_check_swarm_info 0 + + # Check that we can add instances back to the cluster + start_docker 2 + swarm_join "$DISCOVERY" + retry 5 1 discovery_check_swarm_info 2 } @test "zk discovery: failure" {