[sheepdog] [PATCH 4/6] Revert "tests/functional: update test scripts for VID GC feature"

Liu Yuan namei.unix at gmail.com
Mon Mar 16 13:49:32 CET 2015


From: Liu Yuan <liuyuan at cmss.chinamobile.com>

This reverts commit 5d005d41862647f6c7cdb7977f2611e61abc104b.

Signed-off-by: Liu Yuan <liuyuan at cmss.chinamobile.com>
---
 tests/functional/016.out | 12 ++++++------
 tests/functional/044.out | 12 ++++++------
 tests/functional/046.out |  6 +++---
 tests/functional/086.out |  6 +++---
 tests/functional/092.out |  6 +++---
 tests/functional/093.out |  6 +++---
 6 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/tests/functional/016.out b/tests/functional/016.out
index 4c360ac..50e23d7 100644
--- a/tests/functional/016.out
+++ b/tests/functional/016.out
@@ -5,9 +5,9 @@ there should be no vdi
   Name        Id    Size    Used  Shared    Creation time   VDI id  Copies  Tag   Block Size Shift
 there should be no object
 STORE	DATA	VDI	VMSTATE	ATTR	LEDGER	STALE
-0	0	0	0	0	0	0
-1	0	0	0	0	0	0
-2	0	0	0	0	0	0
-3	0	0	0	0	0	0
-4	0	0	0	0	0	0
-5	0	0	0	0	0	0
+0	0	3	0	0	0	0
+1	0	3	0	0	0	0
+2	0	3	0	0	0	0
+3	0	3	0	0	0	0
+4	0	3	0	0	0	0
+5	0	3	0	0	0	0
diff --git a/tests/functional/044.out b/tests/functional/044.out
index bef6982..18fb5c4 100644
--- a/tests/functional/044.out
+++ b/tests/functional/044.out
@@ -4,9 +4,9 @@ there should be no vdi
   Name        Id    Size    Used  Shared    Creation time   VDI id  Copies  Tag   Block Size Shift
 there should be no object
 STORE	DATA	VDI	VMSTATE	ATTR	LEDGER	STALE
-0	0	0	0	0	0	0
-1	0	0	0	0	0	0
-2	0	0	0	0	0	0
-3	0	0	0	0	0	0
-4	0	0	0	0	0	0
-5	0	0	0	0	0	0
+0	0	36	0	0	0	0
+1	0	36	0	0	0	0
+2	0	36	0	0	0	0
+3	0	36	0	0	0	0
+4	0	36	0	0	0	0
+5	0	36	0	0	0	0
diff --git a/tests/functional/046.out b/tests/functional/046.out
index be13a89..d5e4c30 100644
--- a/tests/functional/046.out
+++ b/tests/functional/046.out
@@ -11,10 +11,10 @@ Failed to open VDI test (snapshot id: 0 snapshot tag: ): No VDI found
   Name        Id    Size    Used  Shared    Creation time   VDI id  Copies  Tag   Block Size Shift
 delete current image before snapshot one
   Name        Id    Size    Used  Shared    Creation time   VDI id  Copies  Tag   Block Size Shift
-s test         1  4.0 GB  0.0 MB  0.0 MB DATE   7c2b25      6          snap  22
-  test         0  4.0 GB  0.0 MB  0.0 MB DATE   7c2b26      6                22
+s test         1  4.0 GB  0.0 MB  0.0 MB DATE   7c2b27      6          snap  22
+  test         0  4.0 GB  0.0 MB  0.0 MB DATE   7c2b28      6                22
 Failed to open VDI test (snapshot id: 0 snapshot tag: ): No VDI found
   Name        Id    Size    Used  Shared    Creation time   VDI id  Copies  Tag   Block Size Shift
-s test         1  4.0 GB  0.0 MB  0.0 MB DATE   7c2b25      6          snap  22
+s test         1  4.0 GB  0.0 MB  0.0 MB DATE   7c2b27      6          snap  22
 Failed to open VDI test (snapshot id: 0 snapshot tag: snap): No VDI found
   Name        Id    Size    Used  Shared    Creation time   VDI id  Copies  Tag   Block Size Shift
diff --git a/tests/functional/086.out b/tests/functional/086.out
index 8e9f6cc..84e47ab 100644
--- a/tests/functional/086.out
+++ b/tests/functional/086.out
@@ -37,6 +37,6 @@ STORE	DATA	VDI	VMSTATE	ATTR	LEDGER	STALE
 1	4	3	0	0	1	0
 2	2	4	0	0	2	0
 STORE	DATA	VDI	VMSTATE	ATTR	LEDGER	STALE
-0	0	0	0	0	0	0
-1	0	0	0	0	0	0
-2	0	0	0	0	0	0
+0	0	3	0	0	0	0
+1	0	3	0	0	0	0
+2	0	4	0	0	0	0
diff --git a/tests/functional/092.out b/tests/functional/092.out
index ba132d9..82e28ba 100644
--- a/tests/functional/092.out
+++ b/tests/functional/092.out
@@ -35,8 +35,8 @@ STORE	DATA	VDI	VMSTATE	ATTR	LEDGER	STALE
 2	4	3	0	0	0	0
 there should be no object
 STORE	DATA	VDI	VMSTATE	ATTR	LEDGER	STALE
-0	0	0	0	0	0	0
-1	0	0	0	0	0	0
-2	0	0	0	0	0	0
+0	0	2	0	0	0	0
+1	0	3	0	0	0	0
+2	0	3	0	0	0	0
 there should be no vdi
   Name        Id    Size    Used  Shared    Creation time   VDI id  Copies  Tag   Block Size Shift
diff --git a/tests/functional/093.out b/tests/functional/093.out
index 09926ef..9d95ae5 100644
--- a/tests/functional/093.out
+++ b/tests/functional/093.out
@@ -21,6 +21,6 @@ STORE	DATA	VDI	VMSTATE	ATTR	LEDGER	STALE
 1	3	3	0	0	2	0
 2	3	3	0	0	2	0
 STORE	DATA	VDI	VMSTATE	ATTR	LEDGER	STALE
-0	0	0	0	0	0	0
-1	0	0	0	0	0	0
-2	0	0	0	0	0	0
+0	0	3	0	0	0	0
+1	0	3	0	0	0	0
+2	0	3	0	0	0	0
-- 
1.9.1




More information about the sheepdog mailing list