Message ID | 20170214163517.GQ27752@localhost.localdomain (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
On Tue, Feb 14, 2017 at 11:35:17AM -0500, Jeff Cody wrote: > From 7c135439fd0151860cb0f6ef1a857dfbee6e6317 Mon Sep 17 00:00:00 2001 > From: Jeff Cody <jcody@redhat.com> > Date: Tue, 14 Feb 2017 09:51:42 -0500 > Subject: [PATCH] qemu-iotests: exclude vxhs from image creation via protocol > > The protocol VXHS does not support image creation. Some tests expect > to be able to create images through the protocol. Exclude VXHS from > these tests. [snip] > diff --git a/tests/qemu-iotests/017 b/tests/qemu-iotests/017 > index e3f9e75..4f9302d 100755 > --- a/tests/qemu-iotests/017 > +++ b/tests/qemu-iotests/017 > @@ -41,6 +41,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 > # Any format supporting backing files > _supported_fmt qcow qcow2 vmdk qed > _supported_proto generic > +_unsupported_proto vxhs > _supported_os Linux > _unsupported_imgopts "subformat=monolithicFlat" "subformat=twoGbMaxExtentFlat" I've no objection to your patch as is, just a thought for future improvements. There's quite a few block protos that doen't support image creation. Rather than listing protocols in _unsupported_proto it would be more scalable if we could list features. eg if each test had _supported_feature imagecreate Then, the tests/qemu-iotests/common file could set the list of features supported by each protocol/format. Thus avoiding the need to update all iotests when adding new protocols. We could have features for "encryption", and "snapshots" and "backing_files", etc too Regards, Daniel
On Tue, Feb 14, 2017 at 04:51:09PM +0000, Daniel P. Berrange wrote: > On Tue, Feb 14, 2017 at 11:35:17AM -0500, Jeff Cody wrote: > > From 7c135439fd0151860cb0f6ef1a857dfbee6e6317 Mon Sep 17 00:00:00 2001 > > From: Jeff Cody <jcody@redhat.com> > > Date: Tue, 14 Feb 2017 09:51:42 -0500 > > Subject: [PATCH] qemu-iotests: exclude vxhs from image creation via protocol > > > > The protocol VXHS does not support image creation. Some tests expect > > to be able to create images through the protocol. Exclude VXHS from > > these tests. > > [snip] > > > diff --git a/tests/qemu-iotests/017 b/tests/qemu-iotests/017 > > index e3f9e75..4f9302d 100755 > > --- a/tests/qemu-iotests/017 > > +++ b/tests/qemu-iotests/017 > > @@ -41,6 +41,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 > > # Any format supporting backing files > > _supported_fmt qcow qcow2 vmdk qed > > _supported_proto generic > > +_unsupported_proto vxhs > > _supported_os Linux > > _unsupported_imgopts "subformat=monolithicFlat" "subformat=twoGbMaxExtentFlat" > > I've no objection to your patch as is, just a thought for future > improvements. > > There's quite a few block protos that doen't support image > creation. Rather than listing protocols in _unsupported_proto > it would be more scalable if we could list features. eg if > each test had > > _supported_feature imagecreate > > Then, the tests/qemu-iotests/common file could set the list > of features supported by each protocol/format. Thus avoiding > the need to update all iotests when adding new protocols. We > could have features for "encryption", and "snapshots" and > "backing_files", etc too > I like that approach, good idea. -Jeff
diff --git a/tests/qemu-iotests/017 b/tests/qemu-iotests/017 index e3f9e75..4f9302d 100755 --- a/tests/qemu-iotests/017 +++ b/tests/qemu-iotests/017 @@ -41,6 +41,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 # Any format supporting backing files _supported_fmt qcow qcow2 vmdk qed _supported_proto generic +_unsupported_proto vxhs _supported_os Linux _unsupported_imgopts "subformat=monolithicFlat" "subformat=twoGbMaxExtentFlat" diff --git a/tests/qemu-iotests/020 b/tests/qemu-iotests/020 index 9c4a68c..7a11110 100755 --- a/tests/qemu-iotests/020 +++ b/tests/qemu-iotests/020 @@ -43,6 +43,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 # Any format supporting backing files _supported_fmt qcow qcow2 vmdk qed _supported_proto generic +_unsupported_proto vxhs _supported_os Linux _unsupported_imgopts "subformat=monolithicFlat" \ "subformat=twoGbMaxExtentFlat" \ diff --git a/tests/qemu-iotests/029 b/tests/qemu-iotests/029 index e639ac0..30bab24 100755 --- a/tests/qemu-iotests/029 +++ b/tests/qemu-iotests/029 @@ -42,6 +42,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 # Any format supporting intenal snapshots _supported_fmt qcow2 _supported_proto generic +_unsupported_proto vxhs _supported_os Linux # Internal snapshots are (currently) impossible with refcount_bits=1 _unsupported_imgopts 'refcount_bits=1[^0-9]' diff --git a/tests/qemu-iotests/073 b/tests/qemu-iotests/073 index ad37a61..40f85b1 100755 --- a/tests/qemu-iotests/073 +++ b/tests/qemu-iotests/073 @@ -39,6 +39,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 _supported_fmt qcow2 _supported_proto generic +_unsupported_proto vxhs _supported_os Linux CLUSTER_SIZE=64k diff --git a/tests/qemu-iotests/114 b/tests/qemu-iotests/114 index f110d4f..5b7dc54 100755 --- a/tests/qemu-iotests/114 +++ b/tests/qemu-iotests/114 @@ -39,6 +39,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 _supported_fmt qcow2 _supported_proto generic +_unsupported_proto vxhs _supported_os Linux diff --git a/tests/qemu-iotests/130 b/tests/qemu-iotests/130 index ecc8a5b..f941fc9 100755 --- a/tests/qemu-iotests/130 +++ b/tests/qemu-iotests/130 @@ -42,6 +42,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 _supported_fmt qcow2 _supported_proto generic +_unsupported_proto vxhs _supported_os Linux qemu_comm_method="monitor" diff --git a/tests/qemu-iotests/134 b/tests/qemu-iotests/134 index af618b8..acce946 100755 --- a/tests/qemu-iotests/134 +++ b/tests/qemu-iotests/134 @@ -39,6 +39,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 _supported_fmt qcow2 _supported_proto generic +_unsupported_proto vxhs _supported_os Linux diff --git a/tests/qemu-iotests/156 b/tests/qemu-iotests/156 index cc95ff1..78deaff 100755 --- a/tests/qemu-iotests/156 +++ b/tests/qemu-iotests/156 @@ -48,6 +48,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 _supported_fmt qcow2 qed _supported_proto generic +_unsupported_proto vxhs _supported_os Linux # Create source disk diff --git a/tests/qemu-iotests/158 b/tests/qemu-iotests/158 index a6cdd6d..ef8d70f 100755 --- a/tests/qemu-iotests/158 +++ b/tests/qemu-iotests/158 @@ -39,6 +39,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 _supported_fmt qcow2 _supported_proto generic +_unsupported_proto vxhs _supported_os Linux