[Xen-devel] [PATCH] libxl: update check-xl-disk-parse
The block-attach command now returns 1 when fails. Update first test case to expect return value 1 instead of 255. The parser now doesn't generate output for default values. Remove them from expected output. The "discard=" variant is never not supported, so delete two test cases with that variant. Reported-by: Jim Fehlig Signed-off-by: Wei Liu --- Cc: Jim Fehlig Cc: Ian Campbell Cc: Ian Jackson --- tools/libxl/check-xl-disk-parse | 100 1 file changed, 8 insertions(+), 92 deletions(-) diff --git a/tools/libxl/check-xl-disk-parse b/tools/libxl/check-xl-disk-parse index 1bec4ca..03572e4 100755 --- a/tools/libxl/check-xl-disk-parse +++ b/tools/libxl/check-xl-disk-parse @@ -40,7 +40,7 @@ complete () { fi } -e=255 +e=1 #-- test data -- @@ -52,18 +52,10 @@ one $e foo expected
Re: [Xen-devel] [PATCH] libxl: update check-xl-disk-parse
On Tue, 2015-12-08 at 20:02 +, Wei Liu wrote: > The block-attach command now returns 1 when fails. Update first test > case to expect return value 1 instead of 255. > > The parser now doesn't generate output for default values. Remove them > from expected output. This it looks good. > The "discard=" variant is never not supported, so delete two test cases > with that variant. I don't follow (the double negative "never not" doesn't help). However, assuming you are saying that discard= is always supported, I don't then see the rationale for removing the test. Of course we do want to test things which are supported. > Reported-by: Jim Fehlig > Signed-off-by: Wei Liu > --- > Cc: Jim Fehlig > Cc: Ian Campbell > Cc: Ian Jackson > --- > tools/libxl/check-xl-disk-parse | 100 > > 1 file changed, 8 insertions(+), 92 deletions(-) > > diff --git a/tools/libxl/check-xl-disk-parse b/tools/libxl/check-xl-disk- > parse > index 1bec4ca..03572e4 100755 > --- a/tools/libxl/check-xl-disk-parse > +++ b/tools/libxl/check-xl-disk-parse > @@ -40,7 +40,7 @@ complete () { > fi > } > > -e=255 > +e=1 > > > #-- test data -- > @@ -52,18 +52,10 @@ one $e foo > > expected < disk: { > -"backend_domid": 0, > -"backend_domname": null, > "pdev_path": "/dev/vg/guest-volume", > "vdev": "hda", > -"backend": "unknown", > "format": "raw", > -"script": null, > -"removable": 0, > -"readwrite": 1, > -"is_cdrom": 0, > -"direct_io_safe": false, > -"discard_enable": "True" > +"readwrite": 1 > } > > END > @@ -75,18 +67,11 @@ one 0 raw:/dev/vg/guest-volume,hda,w > > expected < disk: { > -"backend_domid": 0, > -"backend_domname": null, > "pdev_path": "/root/image.iso", > "vdev": "hdc", > -"backend": "unknown", > "format": "raw", > -"script": null, > "removable": 1, > -"readwrite": 0, > -"is_cdrom": 1, > -"direct_io_safe": false, > -"discard_enable": "False" > +"is_cdrom": 1 > } > > END > @@ -99,18 +84,11 @@ one 0 raw:/root/image.iso,hdc:cdrom,ro > > expected < disk: { > -"backend_domid": 0, > -"backend_domname": null, > "pdev_path": "/dev/vg/guest-volume", > "vdev": "xvdb", > "backend": "phy", > "format": "raw", > -"script": null, > -"removable": 0, > -"readwrite": 1, > -"is_cdrom": 0, > -"direct_io_safe": false, > -"discard_enable": "True" > +"readwrite": 1 > } > > EOF > @@ -118,18 +96,11 @@ one 0 > backendtype=phy,vdev=xvdb,access=w,target=/dev/vg/guest-volume > > expected < disk: { > -"backend_domid": 0, > -"backend_domname": null, > "pdev_path": "", > "vdev": "hdc", > -"backend": "unknown", > "format": "empty", > -"script": null, > "removable": 1, > -"readwrite": 0, > -"is_cdrom": 1, > -"direct_io_safe": false, > -"discard_enable": "False" > +"is_cdrom": 1 > } > > EOF > @@ -141,18 +112,10 @@ one 0 ,empty,hdc:cdrom,r > > expected < disk: { > -"backend_domid": 0, > -"backend_domname": null, > -"pdev_path": null, > "vdev": "hdc", > -"backend": "unknown", > "format": "empty", > -"script": null, > "removable": 1, > -"readwrite": 0, > -"is_cdrom": 1, > -"direct_io_safe": false, > -"discard_enable": "False" > +"is_cdrom": 1 > } > > EOF > @@ -161,18 +124,11 @@ one 0 vdev=hdc,access=r,devtype=cdrom > > expected < disk: { > -"backend_domid": 0, > -"backend_domname": null, > "pdev_path": "iqn.2001-05.com.equallogic:0-8a0906-23fe93404- > c82797962054a96d-examplehost", > "vdev": "xvda", > -"backend": "unknown", > "format": "raw", > "script": "block-iscsi", > -"removable": 0, > -"readwrite": 1, > -"is_cdrom": 0, > -"direct_io_safe": false, > -"discard_enable": "True" > +"readwrite": 1 > } > > EOF > @@ -183,18 +139,11 @@ one 0 vdev=xvda,access=w,script=block- > iscsi,target=iqn.2001-05.com.equallogic:0- > > expected < disk: { > -"backend_domid": 0, > -"backend_domname": null, > "pdev_path": "app01", > "vdev": "hda", > -"backend": "unknown", > "format": "raw", > "script": "block-drbd", > -"removable": 0, > -"readwrite": 1, > -"is_cdrom": 0, > -"direct_io_safe": false, > -"discard_enable": "True" > +"readwrite": 1 > } > > EOF > @@ -205,57 +154,24 @@ one 0 drbd:app01,hda,w > > expected < disk: { > -"backend_domid": 0, > -"backend_domname": null, > "pdev_path": "/some/disk/image.raw", > "vdev": "hda", > -"backend": "unknown", > "format": "raw", > -"script": null, > -"removable": 0, > "readwrite": 1, > -"is_cdrom": 0, > -"direct_io_safe": false, > "discard_enable": "True" > } > > END > -one 0 discard=on vdev=hda target=/some/disk/image.raw > -one 0 discard=1 vdev=hda target=/some/
Re: [Xen-devel] [PATCH] libxl: update check-xl-disk-parse
On Wed, Dec 09, 2015 at 10:06:17AM +, Ian Campbell wrote: > On Tue, 2015-12-08 at 20:02 +, Wei Liu wrote: > > The block-attach command now returns 1 when fails. Update first test > > case to expect return value 1 instead of 255. > > > > The parser now doesn't generate output for default values. Remove them > > from expected output. > > This it looks good. > > > The "discard=" variant is never not supported, so delete two test cases > > with that variant. > > I don't follow (the double negative "never not" doesn't help). > Duh, I didn't intend to use double negation. > However, assuming you are saying that discard= is always supported, I don't > then see the rationale for removing the test. Of course we do want to test > things which are supported. > No, it is not supported. I dug into mailing list archive last night and confirmed that Ian J asked Olaf to remove such variant. Those test cases were residual from a previous version Olaf failed to remove. Wei. ___ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel
Re: [Xen-devel] [PATCH] libxl: update check-xl-disk-parse
On Wed, Dec 09, 2015 at 10:15:35AM +, Wei Liu wrote: > On Wed, Dec 09, 2015 at 10:06:17AM +, Ian Campbell wrote: > > On Tue, 2015-12-08 at 20:02 +, Wei Liu wrote: > > > The block-attach command now returns 1 when fails. Update first test > > > case to expect return value 1 instead of 255. > > > > > > The parser now doesn't generate output for default values. Remove them > > > from expected output. > > > > This it looks good. > > > > > The "discard=" variant is never not supported, so delete two test cases > > > with that variant. > > > > I don't follow (the double negative "never not" doesn't help). > > > > Duh, I didn't intend to use double negation. > > > However, assuming you are saying that discard= is always supported, I don't > > then see the rationale for removing the test. Of course we do want to test > > things which are supported. > > > > No, it is not supported. I dug into mailing list archive last night and > confirmed that Ian J asked Olaf to remove such variant. Those test cases > were residual from a previous version Olaf failed to remove. > Forgot to paste in the references: commit 417e6b70d73ffe8f8d3938aa30a413b35098e614 in xen.git http://lists.xen.org/archives/html/xen-devel/2014-05/msg01063.html > Wei. ___ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel
Re: [Xen-devel] [PATCH] libxl: update check-xl-disk-parse
On Wed, 2015-12-09 at 10:24 +, Wei Liu wrote: > On Wed, Dec 09, 2015 at 10:15:35AM +, Wei Liu wrote: > > On Wed, Dec 09, 2015 at 10:06:17AM +, Ian Campbell wrote: > > > On Tue, 2015-12-08 at 20:02 +, Wei Liu wrote: > > > > The block-attach command now returns 1 when fails. Update first > > > > test > > > > case to expect return value 1 instead of 255. > > > > > > > > The parser now doesn't generate output for default values. Remove > > > > them > > > > from expected output. > > > > > > This it looks good. > > > > > > > The "discard=" variant is never not supported, so delete two test > > > > cases > > > > with that variant. > > > > > > I don't follow (the double negative "never not" doesn't help). > > > > > > > Duh, I didn't intend to use double negation. You meant "...was never supported..." then I think? > > > However, assuming you are saying that discard= is always supported, I > > > don't > > > then see the rationale for removing the test. Of course we do want to > > > test > > > things which are supported. > > > > > > > No, it is not supported. I dug into mailing list archive last night and > > confirmed that Ian J asked Olaf to remove such variant. Those test > > cases > > were residual from a previous version Olaf failed to remove. > > > > Forgot to paste in the references: > > commit 417e6b70d73ffe8f8d3938aa30a413b35098e614 in xen.git > > http://lists.xen.org/archives/html/xen-devel/2014-05/msg01063.html Thanks, please include the commit reference in the v2 commit for this change. Ian. ___ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel