[sheepdog] [PATCH v2 20/21] tests/functional: make snapshot related tests to work with erasure code
Liu Yuan
namei.unix at gmail.com
Wed Oct 16 07:50:46 CEST 2013
Signed-off-by: Liu Yuan <namei.unix at gmail.com>
---
sheep/gateway.c | 2 +-
tests/functional/013 | 6 ++---
tests/functional/013.out | 1 -
tests/functional/016 | 8 +++----
tests/functional/016.out | 3 +++
tests/functional/017 | 8 +++----
tests/functional/017.out | 2 --
tests/functional/030 | 24 +++++++++----------
tests/functional/030.out | 44 +++++++++++++++++-----------------
tests/functional/039 | 8 +++----
tests/functional/039.out | 32 ++++++++++++-------------
tests/functional/041 | 8 +++----
tests/functional/041.out | 60 +++++++++++++++++++++++-----------------------
tests/functional/044 | 12 +++++-----
tests/functional/044.out | 3 +++
tests/functional/046 | 10 ++++----
tests/functional/046.out | 12 +++++-----
tests/functional/059 | 6 ++---
tests/functional/059.out | 22 ++++++++---------
tests/functional/075 | 6 ++---
20 files changed, 140 insertions(+), 137 deletions(-)
diff --git a/sheep/gateway.c b/sheep/gateway.c
index e9d08c3..08b9c1e 100644
--- a/sheep/gateway.c
+++ b/sheep/gateway.c
@@ -177,7 +177,7 @@ out:
* 2. requests with copy_policy explicitly set because vdi's copy policy is
* not registered, e.g, requests from 'cluster snapshot load'.
*
- * So we have to firstly check copy_policy directly from iocb and then call
+ * So we have to firstly check copy_policy from heaher directly and then call
* get_vdi_copy_policy(oid).
*/
bool is_erasure_obj(uint64_t oid, uint8_t copy_policy)
diff --git a/tests/functional/013 b/tests/functional/013
index e74b27c..b35b806 100755
--- a/tests/functional/013
+++ b/tests/functional/013
@@ -4,15 +4,15 @@
. ./common
-for i in 0 1 2; do
+for i in `seq 0 5`; do
_start_sheep $i
done
-_wait_for_sheep 3
+_wait_for_sheep 6
_cluster_format -c 1
-$QEMU_IMG create sheepdog:test 4G
+_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_IMG snapshot -c tag$i sheepdog:test
diff --git a/tests/functional/013.out b/tests/functional/013.out
index fd4bf9c..c9101a4 100644
--- a/tests/functional/013.out
+++ b/tests/functional/013.out
@@ -1,6 +1,5 @@
QA output created by 013
using backend plain store
-Formatting 'sheepdog:test', fmt=raw size=4294967296
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
diff --git a/tests/functional/016 b/tests/functional/016
index 92af8ef..7d62ee6 100755
--- a/tests/functional/016
+++ b/tests/functional/016
@@ -4,14 +4,14 @@
. ./common
-for i in 0 1 2; do
+for i in `seq 0 5`; do
_start_sheep $i
done
-_wait_for_sheep 3
+_wait_for_sheep 6
-_cluster_format -c 3
-$DOG vdi create base 100M -P
+_cluster_format -c 6
+_vdi_create base 100M -P
$QEMU_IMG snapshot -c tag sheepdog:base
diff --git a/tests/functional/016.out b/tests/functional/016.out
index 56cf2f8..e685772 100644
--- a/tests/functional/016.out
+++ b/tests/functional/016.out
@@ -7,3 +7,6 @@ STORE DATA VDI VMSTATE ATTR STALE
0 0 3 0 0 0
1 0 3 0 0 0
2 0 3 0 0 0
+3 0 3 0 0 0
+4 0 3 0 0 0
+5 0 3 0 0 0
diff --git a/tests/functional/017 b/tests/functional/017
index 93e3d56..5ebe7da 100755
--- a/tests/functional/017
+++ b/tests/functional/017
@@ -4,20 +4,20 @@
. ./common
-for i in 0 1 2; do
+for i in `seq 0 5`; do
_start_sheep $i
done
-_wait_for_sheep 3
+_wait_for_sheep 6
_cluster_format -c 1
-$QEMU_IMG create sheepdog:test 4G
+_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 create sheepdog:test2 4G
+_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
diff --git a/tests/functional/017.out b/tests/functional/017.out
index f1af9c3..e52a56f 100644
--- a/tests/functional/017.out
+++ b/tests/functional/017.out
@@ -1,7 +1,5 @@
QA output created by 017
using backend plain store
-Formatting 'sheepdog:test', fmt=raw size=4294967296
-Formatting 'sheepdog:test2', fmt=raw size=4294967296
wrote 512/512 bytes at offset 0
512 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
test---[DATE]---[DATE]---[DATE]---(you are here)
diff --git a/tests/functional/030 b/tests/functional/030
index 219f348..2f3d4dc 100755
--- a/tests/functional/030
+++ b/tests/functional/030
@@ -3,18 +3,18 @@
# Test cluster snapshot
. ./common
-for i in `seq 0 3`; do
+for i in `seq 0 5`; do
_start_sheep $i;
done
-_wait_for_sheep 4
+_wait_for_sheep 6
TMPDIR="$STORE/tmp"
rm -rf $TMPDIR
-_cluster_format -c 3
+_cluster_format -c 6
-$DOG vdi create test1 10M
-$DOG vdi create test2 10M
+_vdi_create test1 10M
+_vdi_create test2 10M
_random | $DOG vdi write test1
_random | $DOG vdi write test2
@@ -37,12 +37,12 @@ $DOG cluster snapshot list $TMPDIR | _filter_date
_vdi_list
_cleanup
-for i in `seq 0 3`; do
+for i in `seq 0 5`; do
_start_sheep $i;
done
-_wait_for_sheep 4
+_wait_for_sheep 6
-_cluster_format -c 3
+_cluster_format -c 6
$DOG cluster snapshot load s1 $TMPDIR
_vdi_list
@@ -52,19 +52,19 @@ diff -u $STORE/csum.11.org $STORE/csum.11.new
diff -u $STORE/csum.21.org $STORE/csum.21.new
_cleanup
-for i in `seq 0 3`; do
+for i in `seq 0 5`; do
_start_sheep $i;
done
-_wait_for_sheep 4
+_wait_for_sheep 6
$DOG cluster snapshot load s2 $TMPDIR
_vdi_list
_cleanup
-for i in `seq 0 3`; do
+for i in `seq 0 5`; do
_start_sheep $i;
done
-_wait_for_sheep 4
+_wait_for_sheep 6
$DOG cluster snapshot load 2 $TMPDIR
_vdi_list
diff --git a/tests/functional/030.out b/tests/functional/030.out
index 09a32a8..79a3d56 100644
--- a/tests/functional/030.out
+++ b/tests/functional/030.out
@@ -6,32 +6,32 @@ Index Tag Snapshot Time
1 s1 DATE
2 s2 DATE
Name Id Size Used Shared Creation time VDI id Copies Tag
-s test1 1 10 MB 12 MB 0.0 MB DATE fd32fc 3
-s test1 2 10 MB 12 MB 0.0 MB DATE fd32fd 3
- test1 0 10 MB 0.0 MB 12 MB DATE fd32fe 3
-s test2 1 10 MB 12 MB 0.0 MB DATE fd3815 3
-s test2 2 10 MB 12 MB 0.0 MB DATE fd3816 3
- test2 0 10 MB 0.0 MB 12 MB DATE fd3817 3
+s test1 1 10 MB 12 MB 0.0 MB DATE fd32fc 6
+s test1 2 10 MB 12 MB 0.0 MB DATE fd32fd 6
+ test1 0 10 MB 0.0 MB 12 MB DATE fd32fe 6
+s test2 1 10 MB 12 MB 0.0 MB DATE fd3815 6
+s test2 2 10 MB 12 MB 0.0 MB DATE fd3816 6
+ test2 0 10 MB 0.0 MB 12 MB DATE fd3817 6
using backend plain store
using backend plain store
Name Id Size Used Shared Creation time VDI id Copies Tag
-s test1 1 10 MB 12 MB 0.0 MB DATE fd32fc 3
- test1 0 10 MB 0.0 MB 12 MB DATE fd32fd 3
-s test2 1 10 MB 12 MB 0.0 MB DATE fd3815 3
- test2 0 10 MB 0.0 MB 12 MB DATE fd3816 3
+s test1 1 10 MB 12 MB 0.0 MB DATE fd32fc 6
+ test1 0 10 MB 0.0 MB 12 MB DATE fd32fd 6
+s test2 1 10 MB 12 MB 0.0 MB DATE fd3815 6
+ test2 0 10 MB 0.0 MB 12 MB DATE fd3816 6
using backend plain store
Name Id Size Used Shared Creation time VDI id Copies Tag
-s test1 1 10 MB 12 MB 0.0 MB DATE fd32fc 3
-s test1 2 10 MB 12 MB 0.0 MB DATE fd32fd 3
- test1 0 10 MB 0.0 MB 12 MB DATE fd32fe 3
-s test2 1 10 MB 12 MB 0.0 MB DATE fd3815 3
-s test2 2 10 MB 12 MB 0.0 MB DATE fd3816 3
- test2 0 10 MB 0.0 MB 12 MB DATE fd3817 3
+s test1 1 10 MB 12 MB 0.0 MB DATE fd32fc 6
+s test1 2 10 MB 12 MB 0.0 MB DATE fd32fd 6
+ test1 0 10 MB 0.0 MB 12 MB DATE fd32fe 6
+s test2 1 10 MB 12 MB 0.0 MB DATE fd3815 6
+s test2 2 10 MB 12 MB 0.0 MB DATE fd3816 6
+ test2 0 10 MB 0.0 MB 12 MB DATE fd3817 6
using backend plain store
Name Id Size Used Shared Creation time VDI id Copies Tag
-s test1 1 10 MB 12 MB 0.0 MB DATE fd32fc 3
-s test1 2 10 MB 12 MB 0.0 MB DATE fd32fd 3
- test1 0 10 MB 0.0 MB 12 MB DATE fd32fe 3
-s test2 1 10 MB 12 MB 0.0 MB DATE fd3815 3
-s test2 2 10 MB 12 MB 0.0 MB DATE fd3816 3
- test2 0 10 MB 0.0 MB 12 MB DATE fd3817 3
+s test1 1 10 MB 12 MB 0.0 MB DATE fd32fc 6
+s test1 2 10 MB 12 MB 0.0 MB DATE fd32fd 6
+ test1 0 10 MB 0.0 MB 12 MB DATE fd32fe 6
+s test2 1 10 MB 12 MB 0.0 MB DATE fd3815 6
+s test2 2 10 MB 12 MB 0.0 MB DATE fd3816 6
+ test2 0 10 MB 0.0 MB 12 MB DATE fd3817 6
diff --git a/tests/functional/039 b/tests/functional/039
index b7e1f57..5b2540f 100755
--- a/tests/functional/039
+++ b/tests/functional/039
@@ -4,14 +4,14 @@
. ./common
-for i in `seq 0 4`; do
+for i in `seq 0 5`; do
_start_sheep $i
done
-_wait_for_sheep 5
+_wait_for_sheep 6
-_cluster_format
-$DOG vdi create test 4G
+_cluster_format -c 6
+_vdi_create test 4G
$QEMU_IO -c "write 0 512 -P 1" sheepdog:test | _filter_qemu_io
$DOG vdi snapshot test -s snap1
diff --git a/tests/functional/039.out b/tests/functional/039.out
index 6d1a1aa..caa457a 100644
--- a/tests/functional/039.out
+++ b/tests/functional/039.out
@@ -9,8 +9,8 @@ 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]---(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
+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
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
@@ -21,26 +21,26 @@ snapshot was taken. Continue? [yes/no]: read 512/512 bytes at offset 0
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 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
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 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
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 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
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
@@ -55,8 +55,8 @@ test---[DATE]-+-[DATE]
`-[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 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
diff --git a/tests/functional/041 b/tests/functional/041
index 6b9d87b..1f4cf7c 100755
--- a/tests/functional/041
+++ b/tests/functional/041
@@ -4,14 +4,14 @@
. ./common
-for i in `seq 0 4`; do
+for i in `seq 0 5`; do
_start_sheep $i
done
-_wait_for_sheep 5
+_wait_for_sheep 6
-_cluster_format
-$DOG vdi create test 12M
+_cluster_format -c 6
+_vdi_create test 12M
# create the first object
echo 0 | $DOG vdi write test 0 512
diff --git a/tests/functional/041.out b/tests/functional/041.out
index 7e1316e..cc1b000 100644
--- a/tests/functional/041.out
+++ b/tests/functional/041.out
@@ -1,51 +1,51 @@
QA output created by 041
using backend plain store
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
- test 0 12 MB 0.0 MB 8.0 MB DATE 7c2b28 3
+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
+ test 0 12 MB 0.0 MB 8.0 MB DATE 7c2b28 6
test---[DATE]---[DATE]---[DATE]---(you are here)
b6338c1861851820f8d289c3b4e6443c -
1885611ba75e996f619e8eaf136366e6 -
d210baf5c55b42b5e0edf04a8535ad6d -
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
- test 0 12 MB 0.0 MB 8.0 MB DATE 7c2b29 3
+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
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 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
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 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
test---[DATE]-+-[DATE]---[DATE]---(you are here)
|-[DATE]---[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
-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 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
test---[DATE]-+-[DATE]-+-[DATE]---(you are here)
| `-[DATE]
|-[DATE]---[DATE]
diff --git a/tests/functional/044 b/tests/functional/044
index 0db70f9..4b619ee 100755
--- a/tests/functional/044
+++ b/tests/functional/044
@@ -4,16 +4,16 @@
. ./common
-for i in 0 1 2; do
+for i in `seq 0 5`; do
_start_sheep $i "-w size=1000M"
done
-_wait_for_sheep 3
+_wait_for_sheep 6
-_cluster_format
-$DOG vdi create base1 20M -p 7000
-$DOG vdi create base2 20M -p 7001
-$DOG vdi create base3 20M -p 7002
+_cluster_format -c 6
+_vdi_create base1 20M -p 7000
+_vdi_create base2 20M -p 7001
+_vdi_create base3 20M -p 7002
for i in `seq 0 4`; do
echo $i | $DOG vdi write base1 $((i * 4 * 1024 * 1024)) 512
diff --git a/tests/functional/044.out b/tests/functional/044.out
index 7fa9e17..c70d327 100644
--- a/tests/functional/044.out
+++ b/tests/functional/044.out
@@ -7,3 +7,6 @@ STORE DATA VDI VMSTATE ATTR STALE
0 0 36 0 0 0
1 0 36 0 0 0
2 0 36 0 0 0
+3 0 36 0 0 0
+4 0 36 0 0 0
+5 0 36 0 0 0
diff --git a/tests/functional/046 b/tests/functional/046
index 9d58658..0483778 100755
--- a/tests/functional/046
+++ b/tests/functional/046
@@ -4,16 +4,16 @@
. ./common
-for i in 0 1 2; do
+for i in `seq 0 5`; do
_start_sheep $i
done
-_wait_for_sheep 3
+_wait_for_sheep 6
-_cluster_format -c 2
+_cluster_format -c 6
echo "delete snapshot image before current one"
-$DOG vdi create test 4G
+_vdi_create test 4G
$DOG vdi snapshot test -s snap
_vdi_list
@@ -26,7 +26,7 @@ $DOG vdi delete test # error
_vdi_list
echo "delete current image before snapshot one"
-$DOG vdi create test 4G
+_vdi_create test 4G
$DOG vdi snapshot test -s snap
_vdi_list
diff --git a/tests/functional/046.out b/tests/functional/046.out
index 432b882..0913b95 100644
--- a/tests/functional/046.out
+++ b/tests/functional/046.out
@@ -2,23 +2,23 @@ QA output created by 046
using backend plain store
delete snapshot image before current 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 7c2b26 2
+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 7c2b26 6
Cannot get VDI info for test 0 snap: Failed to find requested tag
Failed to open VDI test
Name Id Size Used Shared Creation time VDI id Copies Tag
- test 0 4.0 GB 0.0 MB 0.0 MB DATE 7c2b26 2
+ test 0 4.0 GB 0.0 MB 0.0 MB DATE 7c2b26 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
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 7c2b25 6 snap
+ test 0 4.0 GB 0.0 MB 0.0 MB DATE 7c2b27 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 2 snap
+s test 1 4.0 GB 0.0 MB 0.0 MB DATE 7c2b25 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
diff --git a/tests/functional/059 b/tests/functional/059
index 8240e11..2b60447 100755
--- a/tests/functional/059
+++ b/tests/functional/059
@@ -4,13 +4,13 @@
. ./common
-for i in `seq 0 2`; do
+for i in `seq 0 5`; do
_start_sheep $i
done
-_wait_for_sheep 3
+_wait_for_sheep 6
-_cluster_format -c 3
+_cluster_format -c 6
$DOG vdi create test 4M
_input()
diff --git a/tests/functional/059.out b/tests/functional/059.out
index 8feae6b..08e111d 100644
--- a/tests/functional/059.out
+++ b/tests/functional/059.out
@@ -1,17 +1,17 @@
QA output created by 059
using backend plain store
Name Id Size Used Shared Creation time VDI id Copies Tag
-s test 1 4.0 MB 4.0 MB 0.0 MB DATE 7c2b25 3 snap1
-s test 2 4.0 MB 4.0 MB 0.0 MB DATE 7c2b26 3 snap2
-s test 3 4.0 MB 4.0 MB 0.0 MB DATE 7c2b27 3 snap3
-s test 4 4.0 MB 4.0 MB 0.0 MB DATE 7c2b28 3 snap4
-s test 5 4.0 MB 4.0 MB 0.0 MB DATE 7c2b29 3 snap5
-s test 6 4.0 MB 4.0 MB 0.0 MB DATE 7c2b2a 3 snap6
-s test 7 4.0 MB 4.0 MB 0.0 MB DATE 7c2b2b 3 snap7
-s test 8 4.0 MB 4.0 MB 0.0 MB DATE 7c2b2c 3 snap8
-s test 9 4.0 MB 4.0 MB 0.0 MB DATE 7c2b2d 3 snap9
-s test 10 4.0 MB 4.0 MB 0.0 MB DATE 7c2b2e 3 snap10
- test 0 4.0 MB 0.0 MB 4.0 MB DATE 7c2b2f 3
+s test 1 4.0 MB 4.0 MB 0.0 MB DATE 7c2b25 6 snap1
+s test 2 4.0 MB 4.0 MB 0.0 MB DATE 7c2b26 6 snap2
+s test 3 4.0 MB 4.0 MB 0.0 MB DATE 7c2b27 6 snap3
+s test 4 4.0 MB 4.0 MB 0.0 MB DATE 7c2b28 6 snap4
+s test 5 4.0 MB 4.0 MB 0.0 MB DATE 7c2b29 6 snap5
+s test 6 4.0 MB 4.0 MB 0.0 MB DATE 7c2b2a 6 snap6
+s test 7 4.0 MB 4.0 MB 0.0 MB DATE 7c2b2b 6 snap7
+s test 8 4.0 MB 4.0 MB 0.0 MB DATE 7c2b2c 6 snap8
+s test 9 4.0 MB 4.0 MB 0.0 MB DATE 7c2b2d 6 snap9
+s test 10 4.0 MB 4.0 MB 0.0 MB DATE 7c2b2e 6 snap10
+ test 0 4.0 MB 0.0 MB 4.0 MB DATE 7c2b2f 6
test---[DATE]---[DATE]---[DATE]---[DATE]---[DATE]---[DATE]---[DATE]---[DATE]---[DATE]---[DATE]---(you are here)
4a05c5b1cc8b68058475dc9b07ddb012 -
12775f311aea71153b7259d33735db26 -
diff --git a/tests/functional/075 b/tests/functional/075
index d65262b..d372d51 100755
--- a/tests/functional/075
+++ b/tests/functional/075
@@ -4,13 +4,13 @@
. ./common
-for i in `seq 0 2`; do
+for i in `seq 0 5`; do
_start_sheep $i
done
-_wait_for_sheep 3
+_wait_for_sheep 6
-_cluster_format -c 3
+_cluster_format -c 6
$DOG vdi create test 4M
_input()
--
1.7.9.5
More information about the sheepdog
mailing list