[sheepdog] [PATCH stable-0.6 07/22] tests/064: exclude non-deterministic line from result

Hitoshi Mitake mitake.hitoshi at gmail.com
Mon Aug 12 16:55:11 CEST 2013


From: MORITA Kazutaka <morita.kazutaka at lab.ntt.co.jp>

The content of store 2 is not deterministic since we kill sheep 2
while reweighting is ongoing.

Signed-off-by: MORITA Kazutaka <morita.kazutaka at lab.ntt.co.jp>
Signed-off-by: Liu Yuan <namei.unix at gmail.com>
---
 tests/064     | 2 +-
 tests/064.out | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/tests/064 b/tests/064
index 64edd8e..e1ff9d0 100755
--- a/tests/064
+++ b/tests/064
@@ -43,7 +43,7 @@ $COLLIE cluster reweight
 # restart sheep1 while reweighting
 _kill_sheep 2
 _wait_for_sheep_recovery 0
-_node_info
+_node_info | grep -v ^2 # the content of sheep 2 is non-deterministic
 $COLLIE node list
 _start_sheep 2
 
diff --git a/tests/064.out b/tests/064.out
index 73346cc..25b2f65 100644
--- a/tests/064.out
+++ b/tests/064.out
@@ -21,7 +21,6 @@ M   Id   Host:Port         V-Nodes       Zone
 STORE	DATA	VDI	VMSTATE	ATTR	STALE
 0	11	1	0	0	0
 1	25	1	0	0	0
-2	18	0	0	0	3
 3	14	0	0	0	0
 M   Id   Host:Port         V-Nodes       Zone
 -    0   127.0.0.1:7000      	85          0
-- 
1.8.1.2




More information about the sheepdog mailing list