From: Hitoshi Mitake <mitake.hito...@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.hito...@lab.ntt.co.jp>
Signed-off-by: Liu Yuan <namei.u...@gmail.com>
Conflicts:
tests/functional/039.out
tests/functional/041.out
tests/functional/046.out
Conflicts were resolved by Hitoshi Mitake.
Signed-off-by: Hitoshi Mitake <mitake.hito...@lab.ntt.co.jp>
---
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 6d1a1aa..e4e0d9e 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 3 snap1
- test 0 4.0 GB 0.0 MB 4.0 MB DATE 7c2b26 3
+ test 0 4.0 GB 0.0 MB 4.0 MB DATE 7c2b27 3
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 3 snap1
-s test 2 4.0 GB 4.0 MB 0.0 MB DATE 7c2b26 3 snap2
- test 0 4.0 GB 0.0 MB 4.0 MB DATE 7c2b27 3
+s test 2 4.0 GB 4.0 MB 0.0 MB DATE 7c2b27 3 snap2
+ test 0 4.0 GB 0.0 MB 4.0 MB DATE 7c2b29 3
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 3 snap1
-s test 2 4.0 GB 4.0 MB 0.0 MB DATE 7c2b26 3 snap2
- test 0 4.0 GB 0.0 MB 4.0 MB DATE 7c2b27 3
+s test 2 4.0 GB 4.0 MB 0.0 MB DATE 7c2b27 3 snap2
+ test 0 4.0 GB 0.0 MB 4.0 MB DATE 7c2b2a 3
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 3 snap1
-s test 2 4.0 GB 4.0 MB 0.0 MB DATE 7c2b26 3 snap2
- test 0 4.0 GB 0.0 MB 4.0 MB DATE 7c2b27 3
+s test 2 4.0 GB 4.0 MB 0.0 MB DATE 7c2b27 3 snap2
+ test 0 4.0 GB 0.0 MB 4.0 MB DATE 7c2b2b 3
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 3 snap1
-s test 2 4.0 GB 4.0 MB 0.0 MB DATE 7c2b26 3 snap2
-s test 3 4.0 GB 4.0 MB 0.0 MB DATE 7c2b27 3 snap3
-s test 4 4.0 GB 4.0 MB 0.0 MB DATE 7c2b28 3 snap4
- test 0 4.0 GB 0.0 MB 4.0 MB DATE 7c2b29 3
+s test 2 4.0 GB 4.0 MB 0.0 MB DATE 7c2b27 3 snap2
+s test 3 4.0 GB 4.0 MB 0.0 MB DATE 7c2b2b 3 snap3
+s test 4 4.0 GB 4.0 MB 0.0 MB DATE 7c2b2c 3 snap4
+ test 0 4.0 GB 0.0 MB 4.0 MB DATE 7c2b2e 3
diff --git a/tests/functional/041.out b/tests/functional/041.out
index 6e02c21..8fb5837 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 3 snap1
s test 2 12 MB 4.0 MB 4.0 MB DATE 7c2b26 3 snap2
s test 3 12 MB 4.0 MB 4.0 MB DATE 7c2b27 3 snap3
-s test 4 12 MB 4.0 MB 4.0 MB DATE 7c2b28 3
- test 0 12 MB 0.0 MB 8.0 MB DATE 7c2b29 3
+s test 4 12 MB 4.0 MB 4.0 MB DATE 7c2b29 3
+ test 0 12 MB 0.0 MB 8.0 MB DATE 7c2b2a 3
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 3 snap1
s test 2 12 MB 4.0 MB 4.0 MB DATE 7c2b26 3 snap2
s test 3 12 MB 4.0 MB 4.0 MB DATE 7c2b27 3 snap3
-s test 4 12 MB 4.0 MB 4.0 MB DATE 7c2b28 3
-s test 5 12 MB 4.0 MB 4.0 MB DATE 7c2b29 3
- test 0 12 MB 0.0 MB 8.0 MB DATE 7c2b2a 3
+s test 4 12 MB 4.0 MB 4.0 MB DATE 7c2b29 3
+s test 5 12 MB 4.0 MB 4.0 MB DATE 7c2b2b 3
+ test 0 12 MB 0.0 MB 8.0 MB DATE 7c2b2c 3
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 3 snap1
s test 2 12 MB 4.0 MB 4.0 MB DATE 7c2b26 3 snap2
s test 3 12 MB 4.0 MB 4.0 MB DATE 7c2b27 3 snap3
-s test 4 12 MB 4.0 MB 4.0 MB DATE 7c2b28 3
-s test 5 12 MB 4.0 MB 4.0 MB DATE 7c2b29 3
-s test 6 12 MB 8.0 MB 0.0 MB DATE 7c2b2a 3
- test 0 12 MB 0.0 MB 8.0 MB DATE 7c2b2b 3
+s test 4 12 MB 4.0 MB 4.0 MB DATE 7c2b29 3
+s test 5 12 MB 4.0 MB 4.0 MB DATE 7c2b2b 3
+s test 6 12 MB 8.0 MB 0.0 MB DATE 7c2b2d 3
+ test 0 12 MB 0.0 MB 8.0 MB DATE 7c2b2e 3
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 3 snap1
s test 2 12 MB 4.0 MB 4.0 MB DATE 7c2b26 3 snap2
s test 3 12 MB 4.0 MB 4.0 MB DATE 7c2b27 3 snap3
-s test 4 12 MB 4.0 MB 4.0 MB DATE 7c2b28 3
-s test 5 12 MB 4.0 MB 4.0 MB DATE 7c2b29 3
-s test 6 12 MB 8.0 MB 0.0 MB DATE 7c2b2a 3
-s test 7 12 MB 4.0 MB 4.0 MB DATE 7c2b2b 3
- test 0 12 MB 0.0 MB 8.0 MB DATE 7c2b2c 3
+s test 4 12 MB 4.0 MB 4.0 MB DATE 7c2b29 3
+s test 5 12 MB 4.0 MB 4.0 MB DATE 7c2b2b 3
+s test 6 12 MB 8.0 MB 0.0 MB DATE 7c2b2d 3
+s test 7 12 MB 4.0 MB 4.0 MB DATE 7c2b2f 3
+ test 0 12 MB 0.0 MB 8.0 MB DATE 7c2b30 3
test---[DATE]-+-[DATE]-+-[DATE]---(you are here)
| `-[DATE]
|-[DATE]---[DATE]
diff --git a/tests/functional/046.out b/tests/functional/046.out
index 432b882..95f1de5 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 2 snap
- test 0 4.0 GB 0.0 MB 0.0 MB DATE 7c2b27 2
+s test 1 4.0 GB 0.0 MB 0.0 MB DATE 7c2b27 2 snap
+ test 0 4.0 GB 0.0 MB 0.0 MB DATE 7c2b28 2
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 2 snap
+s test 1 4.0 GB 0.0 MB 0.0 MB DATE 7c2b27 2 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
--
sheepdog mailing list
sheepdog@lists.wpkg.org
http://lists.wpkg.org/mailman/listinfo/sheepdog
