[sheepdog] [PATCH stable-0.8] tests/functional: fix test results broken by the new VID rule
Hitoshi Mitake
mitake.hitoshi at gmail.com
Thu Jun 12 15:28:15 CEST 2014
From: Hitoshi Mitake <mitake.hitoshi at lab.ntt.co.jp>
Some tests are broken by the commit 21549a1bd498 because it changed
the rule of VID allocation. This patch fixes the output.
Signed-off-by: Hitoshi Mitake <mitake.hitoshi at lab.ntt.co.jp>
Signed-off-by: Liu Yuan <namei.unix at gmail.com>
---
tests/functional/039.out | 22 +++++++++++-----------
tests/functional/041.out | 28 ++++++++++++++--------------
tests/functional/046.out | 6 +++---
3 files changed, 28 insertions(+), 28 deletions(-)
diff --git a/tests/functional/039.out b/tests/functional/039.out
index dcc560a..c28a49c 100644
--- a/tests/functional/039.out
+++ b/tests/functional/039.out
@@ -10,7 +10,7 @@ snapshot was taken. Continue? [yes/no]: read 512/512 bytes at offset 0
test---[DATE]---(you are here)
Name Id Size Used Shared Creation time VDI id Copies Tag
s test 1 4.0 GB 4.0 MB 0.0 MB DATE 7c2b25 6 snap1
- test 0 4.0 GB 0.0 MB 4.0 MB DATE 7c2b26 6
+ test 0 4.0 GB 0.0 MB 4.0 MB DATE 7c2b27 6
wrote 512/512 bytes at offset 0
512 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
wrote 512/512 bytes at offset 0
@@ -22,16 +22,16 @@ test---[DATE]-+-[DATE]
`-(you are here)
Name Id Size Used Shared Creation time VDI id Copies Tag
s test 1 4.0 GB 4.0 MB 0.0 MB DATE 7c2b25 6 snap1
-s test 2 4.0 GB 4.0 MB 0.0 MB DATE 7c2b26 6 snap2
- test 0 4.0 GB 0.0 MB 4.0 MB DATE 7c2b27 6
+s test 2 4.0 GB 4.0 MB 0.0 MB DATE 7c2b27 6 snap2
+ test 0 4.0 GB 0.0 MB 4.0 MB DATE 7c2b29 6
This operation dicards any changes made since the previous
snapshot was taken. Continue? [yes/no]: read 512/512 bytes at offset 0
512 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
test---[DATE]---[DATE]---(you are here)
Name Id Size Used Shared Creation time VDI id Copies Tag
s test 1 4.0 GB 4.0 MB 0.0 MB DATE 7c2b25 6 snap1
-s test 2 4.0 GB 4.0 MB 0.0 MB DATE 7c2b26 6 snap2
- test 0 4.0 GB 0.0 MB 4.0 MB DATE 7c2b27 6
+s test 2 4.0 GB 4.0 MB 0.0 MB DATE 7c2b27 6 snap2
+ test 0 4.0 GB 0.0 MB 4.0 MB DATE 7c2b2a 6
This operation dicards any changes made since the previous
snapshot was taken. Continue? [yes/no]: read 512/512 bytes at offset 0
512 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
@@ -39,8 +39,8 @@ test---[DATE]-+-[DATE]
`-(you are here)
Name Id Size Used Shared Creation time VDI id Copies Tag
s test 1 4.0 GB 4.0 MB 0.0 MB DATE 7c2b25 6 snap1
-s test 2 4.0 GB 4.0 MB 0.0 MB DATE 7c2b26 6 snap2
- test 0 4.0 GB 0.0 MB 4.0 MB DATE 7c2b27 6
+s test 2 4.0 GB 4.0 MB 0.0 MB DATE 7c2b27 6 snap2
+ test 0 4.0 GB 0.0 MB 4.0 MB DATE 7c2b2b 6
wrote 512/512 bytes at offset 0
512 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
wrote 512/512 bytes at offset 0
@@ -56,7 +56,7 @@ test---[DATE]-+-[DATE]
`-(you are here)
Name Id Size Used Shared Creation time VDI id Copies Tag
s test 1 4.0 GB 4.0 MB 0.0 MB DATE 7c2b25 6 snap1
-s test 2 4.0 GB 4.0 MB 0.0 MB DATE 7c2b26 6 snap2
-s test 3 4.0 GB 4.0 MB 0.0 MB DATE 7c2b27 6 snap3
-s test 4 4.0 GB 4.0 MB 0.0 MB DATE 7c2b28 6 snap4
- test 0 4.0 GB 0.0 MB 4.0 MB DATE 7c2b29 6
+s test 2 4.0 GB 4.0 MB 0.0 MB DATE 7c2b27 6 snap2
+s test 3 4.0 GB 4.0 MB 0.0 MB DATE 7c2b2b 6 snap3
+s test 4 4.0 GB 4.0 MB 0.0 MB DATE 7c2b2c 6 snap4
+ test 0 4.0 GB 0.0 MB 4.0 MB DATE 7c2b2e 6
diff --git a/tests/functional/041.out b/tests/functional/041.out
index 49578c7..d0e78e5 100644
--- a/tests/functional/041.out
+++ b/tests/functional/041.out
@@ -13,27 +13,27 @@ d210baf5c55b42b5e0edf04a8535ad6d -
s test 1 12 MB 4.0 MB 0.0 MB DATE 7c2b25 6 snap1
s test 2 12 MB 4.0 MB 4.0 MB DATE 7c2b26 6 snap2
s test 3 12 MB 4.0 MB 4.0 MB DATE 7c2b27 6 snap3
-s test 4 12 MB 4.0 MB 4.0 MB DATE 7c2b28 6
- test 0 12 MB 0.0 MB 8.0 MB DATE 7c2b29 6
+s test 4 12 MB 4.0 MB 4.0 MB DATE 7c2b29 6
+ test 0 12 MB 0.0 MB 8.0 MB DATE 7c2b2a 6
test---[DATE]-+-[DATE]---[DATE]---(you are here)
`-[DATE]
Name Id Size Used Shared Creation time VDI id Copies Tag
s test 1 12 MB 4.0 MB 0.0 MB DATE 7c2b25 6 snap1
s test 2 12 MB 4.0 MB 4.0 MB DATE 7c2b26 6 snap2
s test 3 12 MB 4.0 MB 4.0 MB DATE 7c2b27 6 snap3
-s test 4 12 MB 4.0 MB 4.0 MB DATE 7c2b28 6
-s test 5 12 MB 4.0 MB 4.0 MB DATE 7c2b29 6
- test 0 12 MB 0.0 MB 8.0 MB DATE 7c2b2a 6
+s test 4 12 MB 4.0 MB 4.0 MB DATE 7c2b29 6
+s test 5 12 MB 4.0 MB 4.0 MB DATE 7c2b2b 6
+ test 0 12 MB 0.0 MB 8.0 MB DATE 7c2b2c 6
test---[DATE]-+-[DATE]---[DATE]---(you are here)
`-[DATE]---[DATE]
Name Id Size Used Shared Creation time VDI id Copies Tag
s test 1 12 MB 4.0 MB 0.0 MB DATE 7c2b25 6 snap1
s test 2 12 MB 4.0 MB 4.0 MB DATE 7c2b26 6 snap2
s test 3 12 MB 4.0 MB 4.0 MB DATE 7c2b27 6 snap3
-s test 4 12 MB 4.0 MB 4.0 MB DATE 7c2b28 6
-s test 5 12 MB 4.0 MB 4.0 MB DATE 7c2b29 6
-s test 6 12 MB 8.0 MB 0.0 MB DATE 7c2b2a 6
- test 0 12 MB 0.0 MB 8.0 MB DATE 7c2b2b 6
+s test 4 12 MB 4.0 MB 4.0 MB DATE 7c2b29 6
+s test 5 12 MB 4.0 MB 4.0 MB DATE 7c2b2b 6
+s test 6 12 MB 8.0 MB 0.0 MB DATE 7c2b2d 6
+ test 0 12 MB 0.0 MB 8.0 MB DATE 7c2b2e 6
test---[DATE]-+-[DATE]---[DATE]---(you are here)
|-[DATE]---[DATE]
`-[DATE]
@@ -41,11 +41,11 @@ test---[DATE]-+-[DATE]---[DATE]---(you are here)
s test 1 12 MB 4.0 MB 0.0 MB DATE 7c2b25 6 snap1
s test 2 12 MB 4.0 MB 4.0 MB DATE 7c2b26 6 snap2
s test 3 12 MB 4.0 MB 4.0 MB DATE 7c2b27 6 snap3
-s test 4 12 MB 4.0 MB 4.0 MB DATE 7c2b28 6
-s test 5 12 MB 4.0 MB 4.0 MB DATE 7c2b29 6
-s test 6 12 MB 8.0 MB 0.0 MB DATE 7c2b2a 6
-s test 7 12 MB 4.0 MB 4.0 MB DATE 7c2b2b 6
- test 0 12 MB 0.0 MB 8.0 MB DATE 7c2b2c 6
+s test 4 12 MB 4.0 MB 4.0 MB DATE 7c2b29 6
+s test 5 12 MB 4.0 MB 4.0 MB DATE 7c2b2b 6
+s test 6 12 MB 8.0 MB 0.0 MB DATE 7c2b2d 6
+s test 7 12 MB 4.0 MB 4.0 MB DATE 7c2b2f 6
+ test 0 12 MB 0.0 MB 8.0 MB DATE 7c2b30 6
test---[DATE]-+-[DATE]-+-[DATE]---(you are here)
| `-[DATE]
|-[DATE]---[DATE]
diff --git a/tests/functional/046.out b/tests/functional/046.out
index dd79235..6a9dbc8 100644
--- a/tests/functional/046.out
+++ b/tests/functional/046.out
@@ -13,12 +13,12 @@ Failed to open VDI test
Name Id Size Used Shared Creation time VDI id Copies Tag
delete current image before snapshot one
Name Id Size Used Shared Creation time VDI id Copies Tag
-s test 1 4.0 GB 0.0 MB 0.0 MB DATE 7c2b25 6 snap
- test 0 4.0 GB 0.0 MB 0.0 MB DATE 7c2b27 6
+s test 1 4.0 GB 0.0 MB 0.0 MB DATE 7c2b27 6 snap
+ test 0 4.0 GB 0.0 MB 0.0 MB DATE 7c2b28 6
Cannot get VDI info for test 0 : No VDI found
Failed to open VDI test
Name Id Size Used Shared Creation time VDI id Copies Tag
-s test 1 4.0 GB 0.0 MB 0.0 MB DATE 7c2b25 6 snap
+s test 1 4.0 GB 0.0 MB 0.0 MB DATE 7c2b27 6 snap
Cannot get VDI info for test 0 snap: No VDI found
Failed to open VDI test
Name Id Size Used Shared Creation time VDI id Copies Tag
--
1.9.1
More information about the sheepdog
mailing list