[sheepdog] [PATCH] test: consolidate 028

[Liu Yuan]

From: Liu Yuan <tailai.ly at taobao.com>

With the updated version, current master can't pass it.

Signed-off-by: Liu Yuan <tailai.ly at taobao.com>
---
 tests/028     |   15 ++++++++---
 tests/028.out |   80 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 91 insertions(+), 4 deletions(-)

diff --git a/tests/028 b/tests/028
index 026c6d1..de595df 100755
--- a/tests/028
+++ b/tests/028
@@ -21,9 +21,12 @@ _wait_for_sheep 2
 
 $COLLIE cluster format -c 2
 
-$COLLIE vdi create test 20M
+$COLLIE vdi create test 100M
+
+for i in `seq 0 24`; do
+    echo $i | $COLLIE vdi write test $((i * 4 * 1024 * 1024)) 512
+done
 
-dd if=/dev/urandom | $COLLIE vdi write test
 $COLLIE vdi read test | md5sum > /tmp/csum.0
 
 for i in 2 3; do
@@ -33,7 +36,11 @@ for i in 2 3; do
     _wait_for_sheep_recovery $i
 done
 
-dd if=/dev/urandom | $COLLIE vdi write test -p 7002
+# write different content
+for i in `seq 0 24`; do
+    echo $(($i+1)) | $COLLIE vdi write test $((i * 4 * 1024 * 1024)) 512 -p 7002
+done
+
 $COLLIE vdi read test -p 7002 | md5sum > /tmp/csum.1
 
 for i in 2 3; do
@@ -48,7 +55,7 @@ $COLLIE vdi read test -p 7001 | md5sum > /tmp/csum.3
 
 $COLLIE vdi object test
 
-for i in `seq 0 4`; do
+for i in `seq 0 24`; do
     $COLLIE vdi object -i $i test
 done
 
diff --git a/tests/028.out b/tests/028.out
index db2f209..5bb80ed 100644
--- a/tests/028.out
+++ b/tests/028.out
@@ -24,4 +24,84 @@ Looking for the object 0x7c2b2500000004 (the inode vid 0x7c2b25 idx 4) with 2 no
 
 127.0.0.1:7000 has the object (should be 2 copies)
 127.0.0.1:7001 has the object (should be 2 copies)
+Looking for the object 0x7c2b2500000005 (the inode vid 0x7c2b25 idx 5) with 2 nodes
+
+127.0.0.1:7000 has the object (should be 2 copies)
+127.0.0.1:7001 has the object (should be 2 copies)
+Looking for the object 0x7c2b2500000006 (the inode vid 0x7c2b25 idx 6) with 2 nodes
+
+127.0.0.1:7000 has the object (should be 2 copies)
+127.0.0.1:7001 has the object (should be 2 copies)
+Looking for the object 0x7c2b2500000007 (the inode vid 0x7c2b25 idx 7) with 2 nodes
+
+127.0.0.1:7000 has the object (should be 2 copies)
+127.0.0.1:7001 has the object (should be 2 copies)
+Looking for the object 0x7c2b2500000008 (the inode vid 0x7c2b25 idx 8) with 2 nodes
+
+127.0.0.1:7000 has the object (should be 2 copies)
+127.0.0.1:7001 has the object (should be 2 copies)
+Looking for the object 0x7c2b2500000009 (the inode vid 0x7c2b25 idx 9) with 2 nodes
+
+127.0.0.1:7000 has the object (should be 2 copies)
+127.0.0.1:7001 has the object (should be 2 copies)
+Looking for the object 0x7c2b250000000a (the inode vid 0x7c2b25 idx 10) with 2 nodes
+
+127.0.0.1:7000 has the object (should be 2 copies)
+127.0.0.1:7001 has the object (should be 2 copies)
+Looking for the object 0x7c2b250000000b (the inode vid 0x7c2b25 idx 11) with 2 nodes
+
+127.0.0.1:7000 has the object (should be 2 copies)
+127.0.0.1:7001 has the object (should be 2 copies)
+Looking for the object 0x7c2b250000000c (the inode vid 0x7c2b25 idx 12) with 2 nodes
+
+127.0.0.1:7000 has the object (should be 2 copies)
+127.0.0.1:7001 has the object (should be 2 copies)
+Looking for the object 0x7c2b250000000d (the inode vid 0x7c2b25 idx 13) with 2 nodes
+
+127.0.0.1:7000 has the object (should be 2 copies)
+127.0.0.1:7001 has the object (should be 2 copies)
+Looking for the object 0x7c2b250000000e (the inode vid 0x7c2b25 idx 14) with 2 nodes
+
+127.0.0.1:7000 has the object (should be 2 copies)
+127.0.0.1:7001 has the object (should be 2 copies)
+Looking for the object 0x7c2b250000000f (the inode vid 0x7c2b25 idx 15) with 2 nodes
+
+127.0.0.1:7000 has the object (should be 2 copies)
+127.0.0.1:7001 has the object (should be 2 copies)
+Looking for the object 0x7c2b2500000010 (the inode vid 0x7c2b25 idx 16) with 2 nodes
+
+127.0.0.1:7000 has the object (should be 2 copies)
+127.0.0.1:7001 has the object (should be 2 copies)
+Looking for the object 0x7c2b2500000011 (the inode vid 0x7c2b25 idx 17) with 2 nodes
+
+127.0.0.1:7000 has the object (should be 2 copies)
+127.0.0.1:7001 has the object (should be 2 copies)
+Looking for the object 0x7c2b2500000012 (the inode vid 0x7c2b25 idx 18) with 2 nodes
+
+127.0.0.1:7000 has the object (should be 2 copies)
+127.0.0.1:7001 has the object (should be 2 copies)
+Looking for the object 0x7c2b2500000013 (the inode vid 0x7c2b25 idx 19) with 2 nodes
+
+127.0.0.1:7000 has the object (should be 2 copies)
+127.0.0.1:7001 has the object (should be 2 copies)
+Looking for the object 0x7c2b2500000014 (the inode vid 0x7c2b25 idx 20) with 2 nodes
+
+127.0.0.1:7000 has the object (should be 2 copies)
+127.0.0.1:7001 has the object (should be 2 copies)
+Looking for the object 0x7c2b2500000015 (the inode vid 0x7c2b25 idx 21) with 2 nodes
+
+127.0.0.1:7000 has the object (should be 2 copies)
+127.0.0.1:7001 has the object (should be 2 copies)
+Looking for the object 0x7c2b2500000016 (the inode vid 0x7c2b25 idx 22) with 2 nodes
+
+127.0.0.1:7000 has the object (should be 2 copies)
+127.0.0.1:7001 has the object (should be 2 copies)
+Looking for the object 0x7c2b2500000017 (the inode vid 0x7c2b25 idx 23) with 2 nodes
+
+127.0.0.1:7000 has the object (should be 2 copies)
+127.0.0.1:7001 has the object (should be 2 copies)
+Looking for the object 0x7c2b2500000018 (the inode vid 0x7c2b25 idx 24) with 2 nodes
+
+127.0.0.1:7000 has the object (should be 2 copies)
+127.0.0.1:7001 has the object (should be 2 copies)
 update test successfully
-- 
1.7.1