[sheepdog] [PATCH v3 1/2] tests/func/030: refine test to reflect default format parameter

[Liu Yuan]

Now we can restore 100% for 'cluster snapshot' so add test for it.

Signed-off-by: Liu Yuan <namei.unix at gmail.com>
---
 tests/functional/030     |  6 +++++-
 tests/functional/030.out | 37 ++++++++++++++++++++++++++-----------
 2 files changed, 31 insertions(+), 12 deletions(-)

diff --git a/tests/functional/030 b/tests/functional/030
index 2f3d4dc..cd226d1 100755
--- a/tests/functional/030
+++ b/tests/functional/030
@@ -14,7 +14,7 @@ rm -rf $TMPDIR
 _cluster_format -c 6
 
 _vdi_create test1 10M
-_vdi_create test2 10M
+$DOG vdi create test2 -c 3 10M
 
 _random | $DOG vdi write test1
 _random | $DOG vdi write test2
@@ -83,3 +83,7 @@ $DOG vdi read -s 1 test1 | md5sum > $STORE/csum.11.new
 $DOG vdi read -s 1 test2 | md5sum > $STORE/csum.21.new
 diff -u $STORE/csum.11.org $STORE/csum.11.new
 diff -u $STORE/csum.21.org $STORE/csum.21.new
+
+$DOG cluster info -s | _filter_cluster_info
+_vdi_create test3 10M
+_vdi_list
diff --git a/tests/functional/030.out b/tests/functional/030.out
index c47ffaa..2712d77 100644
--- a/tests/functional/030.out
+++ b/tests/functional/030.out
@@ -9,29 +9,44 @@ Index		Tag		Snapshot Time
 s test1        1   10 MB   12 MB  0.0 MB DATE   fd32fc      6              
 s test1        2   10 MB   12 MB  0.0 MB DATE   fd32fd      6              
   test1        0   10 MB  0.0 MB   12 MB DATE   fd32fe      6              
-s test2        1   10 MB   12 MB  0.0 MB DATE   fd3815      6              
-s test2        2   10 MB   12 MB  0.0 MB DATE   fd3816      6              
-  test2        0   10 MB  0.0 MB   12 MB DATE   fd3817      6              
+s test2        1   10 MB   12 MB  0.0 MB DATE   fd3815      3              
+s test2        2   10 MB   12 MB  0.0 MB DATE   fd3816      3              
+  test2        0   10 MB  0.0 MB   12 MB DATE   fd3817      3              
 using backend plain store
 using backend plain store
   Name        Id    Size    Used  Shared    Creation time   VDI id  Copies  Tag
 s test1        1   10 MB   12 MB  0.0 MB DATE   fd32fc      6              
   test1        0   10 MB  0.0 MB   12 MB DATE   fd32fd      6              
-s test2        1   10 MB   12 MB  0.0 MB DATE   fd3815      6              
-  test2        0   10 MB  0.0 MB   12 MB DATE   fd3816      6              
+s test2        1   10 MB   12 MB  0.0 MB DATE   fd3815      3              
+  test2        0   10 MB  0.0 MB   12 MB DATE   fd3816      3              
 using backend plain store
   Name        Id    Size    Used  Shared    Creation time   VDI id  Copies  Tag
 s test1        1   10 MB   12 MB  0.0 MB DATE   fd32fc      6              
 s test1        2   10 MB   12 MB  0.0 MB DATE   fd32fd      6              
   test1        0   10 MB  0.0 MB   12 MB DATE   fd32fe      6              
-s test2        1   10 MB   12 MB  0.0 MB DATE   fd3815      6              
-s test2        2   10 MB   12 MB  0.0 MB DATE   fd3816      6              
-  test2        0   10 MB  0.0 MB   12 MB DATE   fd3817      6              
+s test2        1   10 MB   12 MB  0.0 MB DATE   fd3815      3              
+s test2        2   10 MB   12 MB  0.0 MB DATE   fd3816      3              
+  test2        0   10 MB  0.0 MB   12 MB DATE   fd3817      3              
 using backend plain store
   Name        Id    Size    Used  Shared    Creation time   VDI id  Copies  Tag
 s test1        1   10 MB   12 MB  0.0 MB DATE   fd32fc      6              
 s test1        2   10 MB   12 MB  0.0 MB DATE   fd32fd      6              
   test1        0   10 MB  0.0 MB   12 MB DATE   fd32fe      6              
-s test2        1   10 MB   12 MB  0.0 MB DATE   fd3815      6              
-s test2        2   10 MB   12 MB  0.0 MB DATE   fd3816      6              
-  test2        0   10 MB  0.0 MB   12 MB DATE   fd3817      6              
+s test2        1   10 MB   12 MB  0.0 MB DATE   fd3815      3              
+s test2        2   10 MB   12 MB  0.0 MB DATE   fd3816      3              
+  test2        0   10 MB  0.0 MB   12 MB DATE   fd3817      3              
+Cluster status: running, auto-recovery enabled
+Cluster store: plain with 6 redundancy policy
+
+Cluster created at DATE
+
+Epoch Time           Version
+DATE      1 [127.0.0.1:7000, 127.0.0.1:7001, 127.0.0.1:7002, 127.0.0.1:7003, 127.0.0.1:7004, 127.0.0.1:7005]
+  Name        Id    Size    Used  Shared    Creation time   VDI id  Copies  Tag
+s test1        1   10 MB   12 MB  0.0 MB DATE   fd32fc      6              
+s test1        2   10 MB   12 MB  0.0 MB DATE   fd32fd      6              
+  test1        0   10 MB  0.0 MB   12 MB DATE   fd32fe      6              
+  test3        0   10 MB  0.0 MB  0.0 MB DATE   fd3662      6              
+s test2        1   10 MB   12 MB  0.0 MB DATE   fd3815      3              
+s test2        2   10 MB   12 MB  0.0 MB DATE   fd3816      3              
+  test2        0   10 MB  0.0 MB   12 MB DATE   fd3817      3              
-- 
1.8.1.2