[sheepdog] [PATCH 06/14] tests: wait for sheep to be started

MORITA Kazutaka morita.kazutaka at lab.ntt.co.jp
Tue Apr 30 10:30:01 CEST 2013


This adds _wait_for_sheep where it is necessary to avoid a false
alarm.

Signed-off-by: MORITA Kazutaka <morita.kazutaka at lab.ntt.co.jp>
---
 tests/002 | 2 ++
 tests/003 | 3 +++
 tests/004 | 3 +++
 3 files changed, 8 insertions(+)

diff --git a/tests/002 b/tests/002
index ac9f16e..13c48eb 100755
--- a/tests/002
+++ b/tests/002
@@ -40,6 +40,8 @@ done
 _wait_for_sheep_stop 0
 _wait_for_sheep_stop 1
 
+_wait_for_sheep 1 2
+
 echo check whether Sheepdog is running with only one node
 $COLLIE cluster info -p 7002 | _filter_cluster_info
 
diff --git a/tests/003 b/tests/003
index 38ede2a..52c5e5f 100755
--- a/tests/003
+++ b/tests/003
@@ -39,6 +39,8 @@ done
 _wait_for_sheep_stop 0
 _wait_for_sheep_stop 1
 
+_wait_for_sheep 1 2
+
 echo check whether Sheepdog is running with only one node
 $COLLIE cluster info -p 7002 | _filter_cluster_info
 
@@ -48,6 +50,7 @@ for i in 0 1; do
     sleep 1
 done
 
+_wait_for_sheep 3
 echo check whether all nodes have the same cluster info
 for i in 0 1 2; do
     $COLLIE cluster info -p 700$i | _filter_cluster_info
diff --git a/tests/004 b/tests/004
index 6a11a56..28e2f24 100755
--- a/tests/004
+++ b/tests/004
@@ -48,6 +48,8 @@ _wait_for_sheep_stop 1
 _wait_for_sheep_stop 2
 _wait_for_sheep_stop 3
 
+_wait_for_sheep 1 4
+
 echo check whether Sheepdog is running with only one node
 $COLLIE cluster info -p 7004 | _filter_cluster_info
 
@@ -57,6 +59,7 @@ for i in 0 1 2 3; do
     sleep 1
 done
 
+_wait_for_sheep 5
 echo check whether all nodes have the same cluster info
 for i in 0 1 2 3 4; do
     $COLLIE cluster info -p 700$i | _filter_cluster_info
-- 
1.8.1.3.566.gaa39828




More information about the sheepdog mailing list