[sheepdog] [PATCH 2/2] tests/048: fix vdi check output

MORITA Kazutaka morita.kazutaka at lab.ntt.co.jp
Fri May 17 17:16:22 CEST 2013


Currently, 'collie vdi check' can repair objects in parallel, so we
cannot guarantee that sheep restores the first replica in this case.
This makes the test show the unique output in spite of the checked
order.

Signed-off-by: MORITA Kazutaka <morita.kazutaka at lab.ntt.co.jp>
---
 tests/048     | 6 +-----
 tests/048.out | 2 --
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/tests/048 b/tests/048
index 097c292..37118b8 100755
--- a/tests/048
+++ b/tests/048
@@ -48,8 +48,4 @@ $COLLIE vdi list -r test | awk '{$7="MASKED";print $0}'
 $COLLIE vdi check test
 # clear the 'first' data block
 dd if=/dev/zero of=$STORE/0/obj/007c2b2500000001 bs=1M count=4 > /dev/null 2>&1
-# 'check' is rather dumb, it just restores 'first' data object
-$COLLIE vdi check test | sort
-# We should get nothing
-$COLLIE vdi read test 4M 512 | tr -d [:cntrl:]
-echo ''
+$COLLIE vdi check test | sort | uniq
diff --git a/tests/048.out b/tests/048.out
index 4da558d..ef80646 100644
--- a/tests/048.out
+++ b/tests/048.out
@@ -69,5 +69,3 @@ obj 7c2b2500000001 locations at epoch 5, copies = 3
 finish check&repair test
 finish check&repair test
 fixed replica 7c2b2500000001
-fixed replica 7c2b2500000001
-
-- 
1.8.1.3.566.gaa39828




More information about the sheepdog mailing list