[sheepdog] [PATCH v4 09/10] tests: fix vdi check output

[MORITA Kazutaka]

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

Now 'collie vdi check' fixes vdi in parallel, so we have to sort the
result of vdi check to get a unique output.

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

diff --git a/tests/048 b/tests/048
index 97ed45e..097c292 100755
--- a/tests/048
+++ b/tests/048
@@ -49,7 +49,7 @@ $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
+$COLLIE vdi check test | sort
 # We should get nothing
 $COLLIE vdi read test 4M 512 | tr -d [:cntrl:]
 echo ''
diff --git a/tests/048.out b/tests/048.out
index 3849cde..4da558d 100644
--- a/tests/048.out
+++ b/tests/048.out
@@ -67,7 +67,7 @@ obj 7c2b2500000001 locations at epoch 5, copies = 3
   test         0  1.0 GB  4.0 MB  0.0 MB DATE   7c2b25     3              
 = test 0 1073741824 4194304 0 MASKED 7c2b25 3
 finish check&repair test
+finish check&repair test
 fixed replica 7c2b2500000001
 fixed replica 7c2b2500000001
-finish check&repair test
 
diff --git a/tests/052 b/tests/052
index 77c2b09..1954737 100755
--- a/tests/052
+++ b/tests/052
@@ -40,7 +40,7 @@ echo yes | $COLLIE cluster recover force
 echo ""
 
 sleep 1
-$COLLIE vdi check test
+$COLLIE vdi check test | sort
 
 for i in 0 1 2 4; do
     $COLLIE cluster info -p 700$i | _filter_cluster_info
diff --git a/tests/052.out b/tests/052.out
index 7fef873..91cd059 100644
--- a/tests/052.out
+++ b/tests/052.out
@@ -45,11 +45,11 @@ The cluster may need to be force recovered if:
   - some nodes fail to start after a cluster shutdown.
 
 Are you sure you want to continue? [yes/no]: 
+finish check&repair test
 fixed missing 7c2b2500000001
 fixed missing 7c2b2500000002
 fixed missing 7c2b2500000003
 fixed missing 7c2b2500000004
-finish check&repair test
 Cluster status: running
 
 Cluster created at DATE
-- 
1.7.9.5