[sheepdog] [PATCH 3/3] tests/func/057: fix false output due to changes of md vdisk management

Liu Yuan namei.unix at gmail.com
Tue Sep 3 05:06:55 CEST 2013


Signed-off-by: Liu Yuan <namei.unix at gmail.com>
---
 tests/functional/057     |    5 ++
 tests/functional/057.out |  124 +++++++++++++++++++++++-----------------------
 2 files changed, 67 insertions(+), 62 deletions(-)

diff --git a/tests/functional/057 b/tests/functional/057
index d1c95f5..8cb9f25 100755
--- a/tests/functional/057
+++ b/tests/functional/057
@@ -10,6 +10,11 @@ if [ "$STORE" != "/tmp/sheepdog/057" ]; then
 	_notrun "This test cannot be run when WD is manually set"
 fi
 
+_make_device 0 $((5 * 1024 ** 3))
+_make_device 1 $((5 * 1024 ** 3))
+_make_device 2 $((5 * 1024 ** 3))
+_make_device 3 $((5 * 1024 ** 3))
+
 for i in 0 1 2; do
 	_start_sheep $i
 done
diff --git a/tests/functional/057.out b/tests/functional/057.out
index 2ed742f..167dd6e 100644
--- a/tests/functional/057.out
+++ b/tests/functional/057.out
@@ -1,30 +1,30 @@
 QA output created by 057
 using backend plain store
 STORE	DATA	VDI	VMSTATE	ATTR	STALE
-0/d0	11	1	0	0	0
-0/d1	5	0	0	0	0
-0/d2	9	0	0	0	0
-1/d0	6	1	0	0	0
-1/d1	9	0	0	0	0
+0/d0	6	0	0	0	0
+0/d1	13	1	0	0	0
+0/d2	6	0	0	0	0
+1/d0	11	1	0	0	0
+1/d1	4	0	0	0	0
 1/d2	10	0	0	0	0
-2/d0	7	0	0	0	0
-2/d1	7	1	0	0	0
-2/d2	11	0	0	0	0
+2/d0	6	1	0	0	0
+2/d1	14	0	0	0	0
+2/d2	5	0	0	0	0
 STORE	DATA	VDI	VMSTATE	ATTR	STALE
-0/d0	7	0	0	0	0
-0/d1	1	0	0	0	0
-0/d2	3	0	0	0	0
-0/d3	3	0	0	0	0
-0/d4	1	0	0	0	0
-1/d0	6	1	0	0	0
-1/d1	6	0	0	0	0
-1/d2	9	0	0	0	0
-2/d0	5	0	0	0	0
-2/d1	4	1	0	0	0
-2/d2	10	0	0	0	0
-3/d0	8	0	0	0	0
-3/d1	6	0	0	0	0
-3/d2	6	1	0	0	0
+0/d0	1	0	0	0	0
+0/d1	5	0	0	0	0
+0/d2	4	0	0	0	0
+0/d3	1	0	0	0	0
+0/d4	4	0	0	0	0
+1/d0	10	1	0	0	0
+1/d1	3	0	0	0	0
+1/d2	8	0	0	0	0
+2/d0	4	1	0	0	0
+2/d1	10	0	0	0	0
+2/d2	5	0	0	0	0
+3/d0	7	0	0	0	0
+3/d1	8	0	0	0	0
+3/d2	5	1	0	0	0
 finish check&repair test
 Cluster status: running, auto-recovery enabled
 
@@ -37,35 +37,35 @@ Failed to execute request, look for sheep.log for more information
 Nodes In Recovery:
   Id   Host:Port         V-Nodes       Zone       Progress
 STORE	DATA	VDI	VMSTATE	ATTR	STALE
-0/d0	7	0	0	0	0
-0/d1	1	0	0	0	0
-0/d2	3	0	0	0	0
-0/d3	3	0	0	0	0
-0/d4	1	0	0	0	0
-1/d0	6	1	0	0	0
-1/d1	6	0	0	0	0
-1/d2	9	0	0	0	0
-2/d0	5	0	0	0	0
-2/d1	4	1	0	0	0
-2/d2	10	0	0	0	0
-3/d0	8	0	0	0	0
-3/d1	6	0	0	0	0
-3/d2	6	1	0	0	0
+0/d0	1	0	0	0	0
+0/d1	5	0	0	0	0
+0/d2	4	0	0	0	0
+0/d3	1	0	0	0	0
+0/d4	4	0	0	0	0
+1/d0	10	1	0	0	0
+1/d1	3	0	0	0	0
+1/d2	8	0	0	0	0
+2/d0	4	1	0	0	0
+2/d1	10	0	0	0	0
+2/d2	5	0	0	0	0
+3/d0	7	0	0	0	0
+3/d1	8	0	0	0	0
+3/d2	5	1	0	0	0
 STORE	DATA	VDI	VMSTATE	ATTR	STALE
-0/d0	7	0	0	0	0
-0/d1	1	0	0	0	0
+0/d0	1	0	0	0	0
+0/d1	5	0	0	0	0
 0/d2	6	0	0	0	0
-0/d3	5	0	0	0	0
-0/d4	4	0	0	0	0
-1/d0	6	1	0	0	0
-1/d1	6	0	0	0	0
-1/d2	9	0	0	0	0
-2/d0	5	0	0	0	0
-2/d1	4	1	0	0	0
-2/d2	10	0	0	0	0
-3/d0	8	0	0	0	0
-3/d1	6	0	0	0	0
-3/d2	6	1	0	0	0
+0/d3	1	0	0	0	0
+0/d4	8	0	0	0	0
+1/d0	10	1	0	0	0
+1/d1	3	0	0	0	0
+1/d2	8	0	0	0	0
+2/d0	4	1	0	0	0
+2/d1	10	0	0	0	0
+2/d2	5	0	0	0	0
+3/d0	7	0	0	0	0
+3/d1	8	0	0	0	0
+3/d2	5	1	0	0	0
 finish check&repair test
 Cluster status: running, auto-recovery enabled
 
@@ -78,20 +78,20 @@ Failed to execute request, look for sheep.log for more information
 Nodes In Recovery:
   Id   Host:Port         V-Nodes       Zone       Progress
 STORE	DATA	VDI	VMSTATE	ATTR	STALE
-0/d0	7	0	0	0	0
-0/d1	1	0	0	0	0
+0/d0	1	0	0	0	0
+0/d1	5	0	0	0	0
 0/d2	6	0	0	0	0
-0/d3	5	0	0	0	0
-0/d4	4	0	0	0	0
-1/d0	6	1	0	0	0
-1/d1	6	0	0	0	0
-1/d2	9	0	0	0	0
-2/d0	5	0	0	0	0
-2/d1	4	1	0	0	0
-2/d2	10	0	0	0	0
-3/d0	8	0	0	0	0
-3/d1	6	0	0	0	0
-3/d2	6	1	0	0	0
+0/d3	1	0	0	0	0
+0/d4	8	0	0	0	0
+1/d0	10	1	0	0	0
+1/d1	3	0	0	0	0
+1/d2	8	0	0	0	0
+2/d0	4	1	0	0	0
+2/d1	10	0	0	0	0
+2/d2	5	0	0	0	0
+3/d0	7	0	0	0	0
+3/d1	8	0	0	0	0
+3/d2	5	1	0	0	0
 Cluster status: running, auto-recovery enabled
 
 Cluster created at DATE
-- 
1.7.9.5




More information about the sheepdog mailing list