[sheepdog] [PATCH 4/5] tests: fix content of 052.out
Since code is printf(%s\n, sd_strerror(rsp-result));, 052.out should add a new line. Signed-off-by: Wang dongxu wangdon...@cmss.chinamobile.com --- tests/functional/052.out | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/functional/052.out b/tests/functional/052.out index 2a533d5..f4487d0 100644 --- a/tests/functional/052.out +++ b/tests/functional/052.out @@ -52,6 +52,7 @@ Failed to read object 807c2b25 Waiting for other nodes to join cluster Failed to read inode header NameIdSizeUsed SharedCreation time VDI id Copies Tag Block Size Shift Cluster status: Waiting for other nodes to join cluster + Failed to read object 807c2b25 Waiting for other nodes to join cluster Failed to read inode header NameIdSizeUsed SharedCreation time VDI id Copies Tag Block Size Shift -- 2.1.0 -- sheepdog mailing list sheepdog@lists.wpkg.org https://lists.wpkg.org/mailman/listinfo/sheepdog
[sheepdog] [PATCH 0/5] tests: fix some test cases to suitable for new sheepdog and QEMU
QEMU and sheepdog changes some output formats while upgrading to new version, so tests/functional test cases need some changes. Wang dongxu (5): tests: avoid qemu-io warning tests: avoid qemu-img snapshot warning tests: correct vdi list tests: fix content of 052.out tests:fix vnode strategy output tests/functional/013 | 8 tests/functional/017 | 14 +++--- tests/functional/024 | 6 +++--- tests/functional/025 | 4 ++-- tests/functional/030.out | 1 + tests/functional/039 | 22 +++--- tests/functional/052.out | 1 + tests/functional/058 | 2 +- tests/functional/059 | 2 +- tests/functional/073.out | 2 +- tests/functional/075 | 2 +- tests/functional/081.out | 6 +++--- tests/functional/082.out | 6 +++--- tests/functional/087.out | 10 +- tests/functional/089.out | 2 +- tests/functional/090.out | 6 +++--- tests/functional/096.out | 2 ++ tests/functional/099.out | 4 ++-- 18 files changed, 52 insertions(+), 48 deletions(-) -- 2.1.0 -- sheepdog mailing list sheepdog@lists.wpkg.org https://lists.wpkg.org/mailman/listinfo/sheepdog
[sheepdog] [PATCH 1/5] tests: avoid qemu-io warning
qemu-io command add a warning message because probing a raw img is dangerous. So
add -f option to avoid this.
Signed-off-by: Wang dongxu wangdon...@cmss.chinamobile.com
---
tests/functional/013 | 6 +++---
tests/functional/017 | 2 +-
tests/functional/024 | 6 +++---
tests/functional/025 | 4 ++--
tests/functional/039 | 22 +++---
tests/functional/058 | 2 +-
tests/functional/059 | 2 +-
tests/functional/075 | 2 +-
8 files changed, 23 insertions(+), 23 deletions(-)
diff --git a/tests/functional/013 b/tests/functional/013
index b35b806..f724841 100755
--- a/tests/functional/013
+++ b/tests/functional/013
@@ -14,11 +14,11 @@ _cluster_format -c 1
_vdi_create test 4G
for i in `seq 1 9`; do
-$QEMU_IO -c write 0 512 -P $i sheepdog:test | _filter_qemu_io
+$QEMU_IO -f raw -c write 0 512 -P $i sheepdog:test | _filter_qemu_io
$QEMU_IMG snapshot -c tag$i sheepdog:test
done
-$QEMU_IO -c read 0 512 -P 9 sheepdog:test | _filter_qemu_io
+$QEMU_IO -f raw -c read 0 512 -P 9 sheepdog:test | _filter_qemu_io
for i in `seq 1 9`; do
-$QEMU_IO -c read 0 512 -P $i sheepdog:test:tag$i | _filter_qemu_io
+$QEMU_IO -f raw -c read 0 512 -P $i sheepdog:test:tag$i | _filter_qemu_io
done
diff --git a/tests/functional/017 b/tests/functional/017
index 5ebe7da..1c22c76 100755
--- a/tests/functional/017
+++ b/tests/functional/017
@@ -20,7 +20,7 @@ $QEMU_IMG snapshot -c tag3 sheepdog:test
_vdi_create test2 4G
$QEMU_IMG snapshot -c tag1 sheepdog:test2
$QEMU_IMG snapshot -c tag2 sheepdog:test2
-$QEMU_IO -c write 0 512 sheepdog:test2:1 | _filter_qemu_io
+$QEMU_IO -f raw -c write 0 512 sheepdog:test2:1 | _filter_qemu_io
$QEMU_IMG snapshot -c tag3 sheepdog:test2
$DOG vdi tree | _filter_short_date
diff --git a/tests/functional/024 b/tests/functional/024
index e1c1180..e8a33c4 100755
--- a/tests/functional/024
+++ b/tests/functional/024
@@ -23,14 +23,14 @@ _vdi_create ${VDI_NAME} ${VDI_SIZE}
sleep 1
echo filling ${VDI_NAME} with data
-$QEMU_IO -c write 0 ${VDI_SIZE} sheepdog:${VDI_NAME} | _filter_qemu_io
+$QEMU_IO -f raw -c write 0 ${VDI_SIZE} sheepdog:${VDI_NAME} | _filter_qemu_io
echo reading back ${VDI_NAME}
-$QEMU_IO -c read 0 1m sheepdog:${VDI_NAME} | _filter_qemu_io
+$QEMU_IO -f raw -c read 0 1m sheepdog:${VDI_NAME} | _filter_qemu_io
echo starting second sheep
_start_sheep 6
_wait_for_sheep 7
echo reading data from second sheep
-$QEMU_IO -c read 0 ${VDI_SIZE} sheepdog:localhost:7001:${VDI_NAME} |
_filter_qemu_io
+$QEMU_IO -f raw -c read 0 ${VDI_SIZE} sheepdog:localhost:7001:${VDI_NAME} |
_filter_qemu_io
diff --git a/tests/functional/025 b/tests/functional/025
index 8f89ccb..37af0ea 100755
--- a/tests/functional/025
+++ b/tests/functional/025
@@ -26,10 +26,10 @@ echo creating vdi ${NAME}
$DOG vdi create ${VDI_NAME} ${VDI_SIZE}
echo filling ${VDI_NAME} with data
-$QEMU_IO -c write 0 ${VDI_SIZE} sheepdog:${VDI_NAME} | _filter_qemu_io
+$QEMU_IO -f raw -c write 0 ${VDI_SIZE} sheepdog:${VDI_NAME} | _filter_qemu_io
echo reading back ${VDI_NAME} from second zone
-$QEMU_IO -c read 0 1m sheepdog:localhost:7002:${VDI_NAME} | _filter_qemu_io
+$QEMU_IO -f raw -c read 0 1m sheepdog:localhost:7002:${VDI_NAME} |
_filter_qemu_io
echo starting a sheep in the third zone
for i in `seq 3 3`; do
diff --git a/tests/functional/039 b/tests/functional/039
index 5b2540f..fddd4fb 100755
--- a/tests/functional/039
+++ b/tests/functional/039
@@ -13,37 +13,37 @@ _wait_for_sheep 6
_cluster_format -c 6
_vdi_create test 4G
-$QEMU_IO -c write 0 512 -P 1 sheepdog:test | _filter_qemu_io
+$QEMU_IO -f raw -c write 0 512 -P 1 sheepdog:test | _filter_qemu_io
$DOG vdi snapshot test -s snap1
-$QEMU_IO -c write 0 512 -P 2 sheepdog:test | _filter_qemu_io
+$QEMU_IO -f raw -c write 0 512 -P 2 sheepdog:test | _filter_qemu_io
echo yes | $DOG vdi rollback test -s snap1
-$QEMU_IO -c read 0 512 -P 1 sheepdog:test | _filter_qemu_io
+$QEMU_IO -f raw -c read 0 512 -P 1 sheepdog:test | _filter_qemu_io
$DOG vdi tree | _filter_short_date
_vdi_list
-$QEMU_IO -c write 0 512 -P 2 sheepdog:test | _filter_qemu_io
+$QEMU_IO -f raw -c write 0 512 -P 2 sheepdog:test | _filter_qemu_io
$DOG vdi snapshot test -s snap2
-$QEMU_IO -c write 0 512 -P 3 sheepdog:test | _filter_qemu_io
+$QEMU_IO -f raw -c write 0 512 -P 3 sheepdog:test | _filter_qemu_io
echo yes | $DOG vdi rollback test -s snap1
-$QEMU_IO -c read 0 512 -P 1 sheepdog:test | _filter_qemu_io
+$QEMU_IO -f raw -c read 0 512 -P 1 sheepdog:test | _filter_qemu_io
$DOG vdi tree | _filter_short_date
_vdi_list
echo yes | $DOG vdi rollback test -s snap2
-$QEMU_IO -c read 0 512 -P 2 sheepdog:test | _filter_qemu_io
+$QEMU_IO -f raw -c read 0 512 -P 2 sheepdog:test | _filter_qemu_io
$DOG vdi tree | _filter_short_date
_vdi_list
echo yes | $DOG vdi rollback test -s snap1
-$QEMU_IO -c read 0 512 -P 1 sheepdog:test | _filter_qemu_io
+$QEMU_IO -f raw -c read 0 512 -P 1 sheepdog:test | _filter_qemu_io
$DOG vdi tree | _filter_short_date
_vdi_list
[sheepdog] [PATCH 2/5] tests: avoid qemu-img snapshot warning
qemu-img snapshot option will print warining message while probing a raw image, so filter them using sed. Signed-off-by: Wang dongxu wangdon...@cmss.chinamobile.com --- tests/functional/013 | 2 +- tests/functional/017 | 12 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/tests/functional/013 b/tests/functional/013 index f724841..d19d8f8 100755 --- a/tests/functional/013 +++ b/tests/functional/013 @@ -15,7 +15,7 @@ _cluster_format -c 1 _vdi_create test 4G for i in `seq 1 9`; do $QEMU_IO -f raw -c write 0 512 -P $i sheepdog:test | _filter_qemu_io -$QEMU_IMG snapshot -c tag$i sheepdog:test +$QEMU_IMG snapshot -c tag$i sheepdog:test 21 | sed '/WARNING/, +2 d' done $QEMU_IO -f raw -c read 0 512 -P 9 sheepdog:test | _filter_qemu_io diff --git a/tests/functional/017 b/tests/functional/017 index 1c22c76..2c34a55 100755 --- a/tests/functional/017 +++ b/tests/functional/017 @@ -13,14 +13,14 @@ _wait_for_sheep 6 _cluster_format -c 1 _vdi_create test 4G -$QEMU_IMG snapshot -c tag1 sheepdog:test -$QEMU_IMG snapshot -c tag2 sheepdog:test -$QEMU_IMG snapshot -c tag3 sheepdog:test +$QEMU_IMG snapshot -c tag1 sheepdog:test 21 | sed '/WARNING/, +2 d' +$QEMU_IMG snapshot -c tag2 sheepdog:test 21 | sed '/WARNING/, +2 d' +$QEMU_IMG snapshot -c tag3 sheepdog:test 21 | sed '/WARNING/, +2 d' _vdi_create test2 4G -$QEMU_IMG snapshot -c tag1 sheepdog:test2 -$QEMU_IMG snapshot -c tag2 sheepdog:test2 +$QEMU_IMG snapshot -c tag1 sheepdog:test2 21 | sed '/WARNING/, +2 d' +$QEMU_IMG snapshot -c tag2 sheepdog:test2 21 | sed '/WARNING/, +2 d' $QEMU_IO -f raw -c write 0 512 sheepdog:test2:1 | _filter_qemu_io -$QEMU_IMG snapshot -c tag3 sheepdog:test2 +$QEMU_IMG snapshot -c tag3 sheepdog:test2 21 | sed '/WARNING/, +2 d' $DOG vdi tree | _filter_short_date -- 2.1.0 -- sheepdog mailing list sheepdog@lists.wpkg.org https://lists.wpkg.org/mailman/listinfo/sheepdog
[sheepdog] [PATCH 3/5] tests: correct vdi list
dog vdi list add column Block Size Shift, add them to test cases. Signed-off-by: Wang dongxu wangdon...@cmss.chinamobile.com --- tests/functional/073.out | 2 +- tests/functional/081.out | 6 +++--- tests/functional/082.out | 6 +++--- tests/functional/087.out | 10 +- tests/functional/089.out | 2 +- tests/functional/090.out | 6 +++--- tests/functional/099.out | 4 ++-- 7 files changed, 18 insertions(+), 18 deletions(-) diff --git a/tests/functional/073.out b/tests/functional/073.out index 8dd2173..3c5fd47 100644 --- a/tests/functional/073.out +++ b/tests/functional/073.out @@ -6,6 +6,6 @@ Cluster created at DATE Epoch Time Version [Host:Port:V-Nodes,,,] DATE 1 [127.0.0.1:7000:128, 127.0.0.1:7001:128, 127.0.0.1:7002:128] - NameIdSizeUsed SharedCreation time VDI id Copies Tag + NameIdSizeUsed SharedCreation time VDI id Copies Tag Block Size Shift test 0 4.0 MB 0.0 MB 0.0 MB DATE 7c2b25 3 hello diff --git a/tests/functional/081.out b/tests/functional/081.out index 92df8ca..7092e97 100644 --- a/tests/functional/081.out +++ b/tests/functional/081.out @@ -55,7 +55,7 @@ vdi.c HTTP/1.1 416 Requested Range Not Satisfiable HTTP/1.1 416 Requested Range Not Satisfiable HTTP/1.1 416 Requested Range Not Satisfiable - NameIdSizeUsed SharedCreation time VDI id Copies Tag + NameIdSizeUsed SharedCreation time VDI id Copies Tag Block Size Shift sd/dog 0 16 PB 56 MB 0.0 MB DATE 5a5cbf4:2 sd 0 16 PB 8.0 MB 0.0 MB DATE 7927f24:2 sd/sheep 0 16 PB 144 MB 0.0 MB DATE 8ad11e4:2 @@ -65,7 +65,7 @@ data137 data19 data4 data97 - NameIdSizeUsed SharedCreation time VDI id Copies Tag + NameIdSizeUsed SharedCreation time VDI id Copies Tag Block Size Shift sd/dog 0 16 PB 56 MB 0.0 MB DATE 5a5cbf4:2 sd 0 16 PB 8.0 MB 0.0 MB DATE 7927f24:2 sd/sheep 0 16 PB 144 MB 0.0 MB DATE 8ad11e4:2 @@ -73,7 +73,7 @@ data97 sd/sheep/allocator 0 16 PB 268 MB 0.0 MB DATE fd57fc4:2 dog sheep - NameIdSizeUsed SharedCreation time VDI id Copies Tag + NameIdSizeUsed SharedCreation time VDI id Copies Tag Block Size Shift sd/dog 0 16 PB 56 MB 0.0 MB DATE 5a5cbf4:2 sd 0 16 PB 8.0 MB 0.0 MB DATE 7927f24:2 sd/sheep 0 16 PB 144 MB 0.0 MB DATE 8ad11e4:2 diff --git a/tests/functional/082.out b/tests/functional/082.out index b3f4dd9..78c5e6a 100644 --- a/tests/functional/082.out +++ b/tests/functional/082.out @@ -60,7 +60,7 @@ trace.c treeview.c trunk.c vdi.c - NameIdSizeUsed SharedCreation time VDI id Copies Tag + NameIdSizeUsed SharedCreation time VDI id Copies Tag Block Size Shift sd/dog 0 16 PB 56 MB 0.0 MB DATE 5a5cbf4:2 sd 0 16 PB 8.0 MB 0.0 MB DATE 7927f24:2 sd/sheep 0 16 PB 176 MB 0.0 MB DATE 8ad11e4:2 @@ -78,7 +78,7 @@ data6 data7 data8 data9 - NameIdSizeUsed SharedCreation time VDI id Copies Tag + NameIdSizeUsed SharedCreation time VDI id Copies Tag Block Size Shift sd/dog 0 16 PB 56 MB 0.0 MB DATE 5a5cbf4:2 sd 0 16 PB 8.0 MB 0.0 MB DATE 7927f24:2 sd/sheep 0 16 PB 176 MB 0.0 MB DATE 8ad11e4:2 @@ -86,7 +86,7 @@ data9 sd/sheep/allocator 0 16 PB 316 MB 0.0 MB DATE fd57fc4:2 dog sheep - NameIdSizeUsed SharedCreation time VDI id Copies Tag + NameIdSizeUsed SharedCreation time VDI id Copies Tag Block Size Shift sd/dog 0 16 PB 56 MB 0.0 MB DATE 5a5cbf4:2 sd 0 16 PB 8.0 MB 0.0 MB DATE 7927f24:2 sd/sheep 0 16 PB 176 MB 0.0 MB DATE 8ad11e4:2 diff --git a/tests/functional/087.out b/tests/functional/087.out index 04e4210..0fcc7f3 100644 --- a/tests/functional/087.out +++ b/tests/functional/087.out @@ -2,11 +2,11 @@ QA output created by 087 using backend plain store 206 206 - NameIdSizeUsed SharedCreation time VDI id Copies Tag + NameIdSizeUsed SharedCreation time VDI id Copies Tag Block Size Shift sd 0 16 PB 4.0 MB 0.0 MB DATE 7927f24:2 sd/sheep 0 16 PB 8.0 MB 0.0 MB DATE 8ad11e4:2 sd/sheep/allocator 0 16 PB
[sheepdog] [PATCH 5/5] tests:fix vnode strategy output
since commit 5fed9d6, Cluster vnodes strategy information is produced, so fix them in test cases. Signed-off-by: Wang dongxu wangdon...@cmss.chinamobile.com --- tests/functional/030.out | 1 + tests/functional/096.out | 2 ++ 2 files changed, 3 insertions(+) diff --git a/tests/functional/030.out b/tests/functional/030.out index 2c788f0..baf51a7 100644 --- a/tests/functional/030.out +++ b/tests/functional/030.out @@ -37,6 +37,7 @@ s test22 10 MB 12 MB 0.0 MB DATE fd3816 3 22 test20 10 MB 0.0 MB 12 MB DATE fd3817 322 Cluster status: running, auto-recovery enabled Cluster store: plain with 6 redundancy policy +Cluster vnodes strategy: auto Cluster vnode mode: node Cluster created at DATE diff --git a/tests/functional/096.out b/tests/functional/096.out index 2ff9dc6..a555287 100644 --- a/tests/functional/096.out +++ b/tests/functional/096.out @@ -27,6 +27,7 @@ $ ../../dog/dog cluster format -c 3 $ ../../dog/dog cluster info -v Cluster status: running, auto-recovery enabled Cluster store: plain with 3 redundancy policy +Cluster vnodes strategy: auto Cluster vnode mode: node Cluster created at DATE @@ -80,6 +81,7 @@ The cluster's redundancy level is set to 2, the old one was 3. $ ../../dog/dog cluster info -v Cluster status: running, auto-recovery enabled Cluster store: plain with 2 redundancy policy +Cluster vnodes strategy: auto Cluster vnode mode: node Cluster created at DATE -- 2.1.0 -- sheepdog mailing list sheepdog@lists.wpkg.org https://lists.wpkg.org/mailman/listinfo/sheepdog
[sheepdog] [PATCH] Change tests outputs to be suitable for new cluster info format
From: Wang Dongxu wangdon...@cmss.chinamobile.com Since commit 4fea6f95a2de90f45f90415f289083c6b29120a7, dog cluster info change its output format, to make sure tests/functional cases are suitable for the new format, modified these output. Signed-off-by: Wang Dongxu wangdon...@cmss.chinamobile.com --- tests/functional/001.out | 36 +++--- tests/functional/002.out | 30 +- tests/functional/003.out | 30 +- tests/functional/004.out | 100 ++-- tests/functional/005.out | 90 tests/functional/007.out | 20 tests/functional/010.out |8 ++-- tests/functional/025.out | 24 tests/functional/030.out |4 +- tests/functional/043.out | 82 +++--- tests/functional/051.out | 18 +++--- tests/functional/052.out | 116 +- tests/functional/053.out | 128 +++--- tests/functional/054.out | 10 ++-- tests/functional/055.out | 20 tests/functional/056.out | 14 +++--- tests/functional/057.out | 18 +++--- tests/functional/063.out |8 ++-- tests/functional/064.out | 10 ++-- tests/functional/065.out |8 ++-- tests/functional/066.out | 72 +- tests/functional/068.out | 36 +++--- tests/functional/069.out |8 ++-- tests/functional/070.out | 36 +++--- tests/functional/073.out |4 +- tests/functional/085.out |4 +- tests/functional/088.out | 12 ++-- tests/functional/096.out |8 ++-- tests/functional/098.out | 26 +- 29 files changed, 490 insertions(+), 490 deletions(-) diff --git a/tests/functional/001.out b/tests/functional/001.out index 82d27da..ef39e0a 100644 --- a/tests/functional/001.out +++ b/tests/functional/001.out @@ -5,29 +5,29 @@ Cluster status: running, auto-recovery enabled Cluster created at DATE -Epoch Time Version -DATE 5 [127.0.0.1:7000, 127.0.0.1:7001, 127.0.0.1:7002] -DATE 4 [127.0.0.1:7002] -DATE 3 [127.0.0.1:7001, 127.0.0.1:7002] -DATE 2 [127.0.0.1:7001] -DATE 1 [127.0.0.1:7000, 127.0.0.1:7001] +Epoch Time Version [Host:Port:V-Nodes,,,] +DATE 5 [127.0.0.1:7000:128, 127.0.0.1:7001:128, 127.0.0.1:7002:128] +DATE 4 [127.0.0.1:7002:128] +DATE 3 [127.0.0.1:7001:128, 127.0.0.1:7002:128] +DATE 2 [127.0.0.1:7001:128] +DATE 1 [127.0.0.1:7000:128, 127.0.0.1:7001:128] Cluster status: running, auto-recovery enabled Cluster created at DATE -Epoch Time Version -DATE 5 [127.0.0.1:7000, 127.0.0.1:7001, 127.0.0.1:7002] -DATE 4 [127.0.0.1:7002] -DATE 3 [127.0.0.1:7001, 127.0.0.1:7002] -DATE 2 [127.0.0.1:7001] -DATE 1 [127.0.0.1:7000, 127.0.0.1:7001] +Epoch Time Version [Host:Port:V-Nodes,,,] +DATE 5 [127.0.0.1:7000:128, 127.0.0.1:7001:128, 127.0.0.1:7002:128] +DATE 4 [127.0.0.1:7002:128] +DATE 3 [127.0.0.1:7001:128, 127.0.0.1:7002:128] +DATE 2 [127.0.0.1:7001:128] +DATE 1 [127.0.0.1:7000:128, 127.0.0.1:7001:128] Cluster status: running, auto-recovery enabled Cluster created at DATE -Epoch Time Version -DATE 5 [127.0.0.1:7000, 127.0.0.1:7001, 127.0.0.1:7002] -DATE 4 [127.0.0.1:7002] -DATE 3 [127.0.0.1:7001, 127.0.0.1:7002] -DATE 2 [127.0.0.1:7001] -DATE 1 [127.0.0.1:7000, 127.0.0.1:7001] +Epoch Time Version [Host:Port:V-Nodes,,,] +DATE 5 [127.0.0.1:7000:128, 127.0.0.1:7001:128, 127.0.0.1:7002:128] +DATE 4 [127.0.0.1:7002:128] +DATE 3 [127.0.0.1:7001:128, 127.0.0.1:7002:128] +DATE 2 [127.0.0.1:7001:128] +DATE 1 [127.0.0.1:7000:128, 127.0.0.1:7001:128] diff --git a/tests/functional/002.out b/tests/functional/002.out index ce99957..0efa4be 100644 --- a/tests/functional/002.out +++ b/tests/functional/002.out @@ -5,26 +5,26 @@ Cluster status: running, auto-recovery enabled Cluster created at DATE -Epoch Time Version -DATE 4 [127.0.0.1:7000, 127.0.0.1:7001, 127.0.0.1:7002] -DATE 3 [127.0.0.1:7002] -DATE 2 [127.0.0.1:7001, 127.0.0.1:7002] -DATE 1 [127.0.0.1:7000, 127.0.0.1:7001, 127.0.0.1:7002] +Epoch Time Version [Host:Port:V-Nodes,,,] +DATE 4 [127.0.0.1:7000:128, 127.0.0.1:7001:128, 127.0.0.1:7002:128] +DATE 3 [127.0.0.1:7002:128] +DATE 2 [127.0.0.1:7001:128, 127.0.0.1:7002:128] +DATE 1 [127.0.0.1:7000:128, 127.0.0.1:7001:128, 127.0.0.1:7002:128] Cluster status: running, auto-recovery enabled Cluster created at DATE -Epoch Time Version -DATE 4 [127.0.0.1:7000, 127.0.0.1:7001, 127.0.0.1:7002] -DATE 3 [127.0.0.1:7002] -DATE 2 [127.0.0.1:7001, 127.0.0.1:7002] -DATE 1 [127.0.0.1:7000, 127.0.0.1:7001, 127.0.0.1:7002] +Epoch Time Version [Host:Port:V-Nodes,,,] +DATE 4 [127.0.0.1:7000:128, 127.0.0.1:7001:128, 127.0.0.1:7002:128] +DATE 3 [127.0.0.1:7002:128
[sheepdog] [PATCH] Change tests outputs to be suitable for new cluster info format
Since commit 4fea6f95a2de90f45f90415f289083c6b29120a7, dog cluster info change its output format, to make sure tests/functional cases are suitable for the new format, modified these output. Signed-off-by: Wang Dongxu wangdon...@cmss.chinamobile.com --- tests/functional/001.out | 36 +++--- tests/functional/002.out | 30 +- tests/functional/003.out | 30 +- tests/functional/004.out | 100 ++-- tests/functional/005.out | 90 tests/functional/007.out | 20 tests/functional/010.out |8 ++-- tests/functional/025.out | 24 tests/functional/030.out |4 +- tests/functional/043.out | 82 +++--- tests/functional/051.out | 18 +++--- tests/functional/052.out | 116 +- tests/functional/053.out | 128 +++--- tests/functional/054.out | 10 ++-- tests/functional/055.out | 20 tests/functional/056.out | 14 +++--- tests/functional/057.out | 18 +++--- tests/functional/063.out |8 ++-- tests/functional/064.out | 10 ++-- tests/functional/065.out |8 ++-- tests/functional/066.out | 72 +- tests/functional/068.out | 36 +++--- tests/functional/069.out |8 ++-- tests/functional/070.out | 36 +++--- tests/functional/073.out |4 +- tests/functional/085.out |4 +- tests/functional/088.out | 12 ++-- tests/functional/096.out |8 ++-- tests/functional/098.out | 26 +- 29 files changed, 490 insertions(+), 490 deletions(-) diff --git a/tests/functional/001.out b/tests/functional/001.out index 82d27da..ef39e0a 100644 --- a/tests/functional/001.out +++ b/tests/functional/001.out @@ -5,29 +5,29 @@ Cluster status: running, auto-recovery enabled Cluster created at DATE -Epoch Time Version -DATE 5 [127.0.0.1:7000, 127.0.0.1:7001, 127.0.0.1:7002] -DATE 4 [127.0.0.1:7002] -DATE 3 [127.0.0.1:7001, 127.0.0.1:7002] -DATE 2 [127.0.0.1:7001] -DATE 1 [127.0.0.1:7000, 127.0.0.1:7001] +Epoch Time Version [Host:Port:V-Nodes,,,] +DATE 5 [127.0.0.1:7000:128, 127.0.0.1:7001:128, 127.0.0.1:7002:128] +DATE 4 [127.0.0.1:7002:128] +DATE 3 [127.0.0.1:7001:128, 127.0.0.1:7002:128] +DATE 2 [127.0.0.1:7001:128] +DATE 1 [127.0.0.1:7000:128, 127.0.0.1:7001:128] Cluster status: running, auto-recovery enabled Cluster created at DATE -Epoch Time Version -DATE 5 [127.0.0.1:7000, 127.0.0.1:7001, 127.0.0.1:7002] -DATE 4 [127.0.0.1:7002] -DATE 3 [127.0.0.1:7001, 127.0.0.1:7002] -DATE 2 [127.0.0.1:7001] -DATE 1 [127.0.0.1:7000, 127.0.0.1:7001] +Epoch Time Version [Host:Port:V-Nodes,,,] +DATE 5 [127.0.0.1:7000:128, 127.0.0.1:7001:128, 127.0.0.1:7002:128] +DATE 4 [127.0.0.1:7002:128] +DATE 3 [127.0.0.1:7001:128, 127.0.0.1:7002:128] +DATE 2 [127.0.0.1:7001:128] +DATE 1 [127.0.0.1:7000:128, 127.0.0.1:7001:128] Cluster status: running, auto-recovery enabled Cluster created at DATE -Epoch Time Version -DATE 5 [127.0.0.1:7000, 127.0.0.1:7001, 127.0.0.1:7002] -DATE 4 [127.0.0.1:7002] -DATE 3 [127.0.0.1:7001, 127.0.0.1:7002] -DATE 2 [127.0.0.1:7001] -DATE 1 [127.0.0.1:7000, 127.0.0.1:7001] +Epoch Time Version [Host:Port:V-Nodes,,,] +DATE 5 [127.0.0.1:7000:128, 127.0.0.1:7001:128, 127.0.0.1:7002:128] +DATE 4 [127.0.0.1:7002:128] +DATE 3 [127.0.0.1:7001:128, 127.0.0.1:7002:128] +DATE 2 [127.0.0.1:7001:128] +DATE 1 [127.0.0.1:7000:128, 127.0.0.1:7001:128] diff --git a/tests/functional/002.out b/tests/functional/002.out index ce99957..0efa4be 100644 --- a/tests/functional/002.out +++ b/tests/functional/002.out @@ -5,26 +5,26 @@ Cluster status: running, auto-recovery enabled Cluster created at DATE -Epoch Time Version -DATE 4 [127.0.0.1:7000, 127.0.0.1:7001, 127.0.0.1:7002] -DATE 3 [127.0.0.1:7002] -DATE 2 [127.0.0.1:7001, 127.0.0.1:7002] -DATE 1 [127.0.0.1:7000, 127.0.0.1:7001, 127.0.0.1:7002] +Epoch Time Version [Host:Port:V-Nodes,,,] +DATE 4 [127.0.0.1:7000:128, 127.0.0.1:7001:128, 127.0.0.1:7002:128] +DATE 3 [127.0.0.1:7002:128] +DATE 2 [127.0.0.1:7001:128, 127.0.0.1:7002:128] +DATE 1 [127.0.0.1:7000:128, 127.0.0.1:7001:128, 127.0.0.1:7002:128] Cluster status: running, auto-recovery enabled Cluster created at DATE -Epoch Time Version -DATE 4 [127.0.0.1:7000, 127.0.0.1:7001, 127.0.0.1:7002] -DATE 3 [127.0.0.1:7002] -DATE 2 [127.0.0.1:7001, 127.0.0.1:7002] -DATE 1 [127.0.0.1:7000, 127.0.0.1:7001, 127.0.0.1:7002] +Epoch Time Version [Host:Port:V-Nodes,,,] +DATE 4 [127.0.0.1:7000:128, 127.0.0.1:7001:128, 127.0.0.1:7002:128] +DATE 3 [127.0.0.1:7002:128] +DATE 2 [127.0.0.1:7001:128, 127.0.0.1:7002:128
