iotests: trivial cleanups
v2 cover iotests: trivial cleanups
The most trivial set of cleanups to iotests common libraries and the 044 test.
Changes from v1:
* Added emacs mode hints on tests/qemu-iotests/common.* files (Eric Blake)
Cleber Rosa (4):
qemu-iotests: remove bash shebang from library files
qemu-iotests: remove forceful execution success from library files
qemu-iotests: 044: pass is actually a noop, so remove it
qemu-iotests: 044: remove inaccurate docstring class description
tests/qemu-iotests/044 | 4 ---- tests/qemu-iotests/common.config | 5 +---- tests/qemu-iotests/common.filter | 5 +---- tests/qemu-iotests/common.nbd | 3 +-- tests/qemu-iotests/common.pattern | 2 +- tests/qemu-iotests/common.qemu | 2 +- tests/qemu-iotests/common.rc | 5 +---- tests/qemu-iotests/common.tls | 2 +- 8 files changed, 7 insertions(+), 21 deletions(-)
Signature · 1 line
2.21.0
PATCH v2 1/4 qemu-iotests: remove bash shebang from library files
Due to not being able to find a reason to have shebangs on files that are not executable.
While at it, add a mode hint to emacs, which would be clueless or plain wrong about these containing shell code.
--- tests/qemu-iotests/common.config | 2 +- tests/qemu-iotests/common.filter | 2 +- tests/qemu-iotests/common.nbd | 3 +-- tests/qemu-iotests/common.pattern | 2 +- tests/qemu-iotests/common.qemu | 2 +- tests/qemu-iotests/common.rc | 2 +- tests/qemu-iotests/common.tls | 2 +- 7 files changed, 7 insertions(+), 8 deletions(-)
tests/qemu-iotests/common.config +1 -1
@@ -1,4 +1,4 @@ -#!/usr/bin/env bash +# -*- emacs mode: sh -*- # # Copyright (C) 2009 Red Hat, Inc. # Copyright (c) 2000-2003,2006 Silicon Graphics, Inc. All Rights Reserved.
tests/qemu-iotests/common.filter +1 -1
@@ -1,4 +1,4 @@ -#!/usr/bin/env bash +# -*- emacs mode: sh -*- # # Copyright (C) 2009 Red Hat, Inc. # Copyright (c) 2000-2001 Silicon Graphics, Inc. All Rights Reserved.
tests/qemu-iotests/common.nbd +1 -2
@@ -1,5 +1,4 @@ -#!/usr/bin/env bash -# -*- shell-script-mode -*- +# -*- emacs mode: sh -*- # # Helpers for NBD server related config #
tests/qemu-iotests/common.pattern +1 -1
@@ -1,4 +1,4 @@ -#!/usr/bin/env bash +# -*- emacs mode: sh -*- # # Copyright (C) 2009 Red Hat, Inc. #
tests/qemu-iotests/common.qemu +1 -1
@@ -1,4 +1,4 @@ -#!/usr/bin/env bash +# -*- emacs mode: sh -*- # # This allows for launching of multiple QEMU instances, with independent # communication possible to each instance.
tests/qemu-iotests/common.rc +1 -1
@@ -1,4 +1,4 @@ -#!/usr/bin/env bash +# -*- emacs mode: sh -*- # # Copyright (C) 2009 Red Hat, Inc. # Copyright (c) 2000-2006 Silicon Graphics, Inc. All Rights Reserved.
tests/qemu-iotests/common.tls +1 -1
@@ -1,4 +1,4 @@ -#!/usr/bin/env bash +# -*- emacs mode: sh -*- # # Helpers for TLS related config #
Signature · 1 line
2.21.0
Re: [PATCH v2 1/4] qemu-iotests: remove bash shebang from library files
Quoted 23 lines · Cleber Rosa
Due to not being able to find a reason to have shebangs on files that are not executable.
While at it, add a mode hint to emacs, which would be clueless or plain wrong about these containing shell code.
Suggested-by Eric Blake <[email protected]>Signed-off-by Cleber Rosa <[email protected]>--- tests/qemu-iotests/common.config | 2 +- tests/qemu-iotests/common.filter | 2 +- tests/qemu-iotests/common.nbd | 3 +-- tests/qemu-iotests/common.pattern | 2 +- tests/qemu-iotests/common.qemu | 2 +- tests/qemu-iotests/common.rc | 2 +- tests/qemu-iotests/common.tls | 2 +- 7 files changed, 7 insertions(+), 8 deletions(-)tests/qemu-iotests/common.config +0
-0
tests/qemu-iotests/common.config line 1
Quoted 2 lines
tests/qemu-iotests/common.config +1
-1@@ -1,4 +1,4 @@ -#!/usr/bin/env bash +# -*- emacs mode: sh -*-
I thought my version:
# hey emacs, this file will be sourced by bash -*- mode: sh -*- was cuter, but that's not a requirement, and yours works ;)
Signature · 3 lines
Eric Blake, Principal Software Engineer Red Hat, Inc. +1-919-301-3226 Virtualization: qemu.org | libvirt.org
Re: [PATCH v2 1/4] qemu-iotests: remove bash shebang from library files
----- Original Message -----
Quoted 36 lines
From: "Eric Blake" <[email protected]>
To: "Cleber Rosa" <[email protected]>, [email protected]
Cc: [email protected], "Max Reitz" <[email protected]>, "Kevin Wolf" <[email protected]>, [email protected], "Michael Tokarev" <[email protected]>, "Laurent Vivier" <[email protected]>
Sent: Wednesday, October 9, 2019 3:51:56 PM
Subject: Re: [PATCH v2 1/4] qemu-iotests: remove bash shebang from library filesQuoted 24 lines · Cleber Rosa
Due to not being able to find a reason to have shebangs on files that are not executable.
While at it, add a mode hint to emacs, which would be clueless or plain wrong about these containing shell code.
Suggested-by Eric Blake <[email protected]>Signed-off-by Cleber Rosa <[email protected]>--- tests/qemu-iotests/common.config | 2 +- tests/qemu-iotests/common.filter | 2 +- tests/qemu-iotests/common.nbd | 3 +-- tests/qemu-iotests/common.pattern | 2 +- tests/qemu-iotests/common.qemu | 2 +- tests/qemu-iotests/common.rc | 2 +- tests/qemu-iotests/common.tls | 2 +- 7 files changed, 7 insertions(+), 8 deletions(-)tests/qemu-iotests/common.config +0
-0tests/qemu-iotests/common.config line 1
Quoted 2 lines
tests/qemu-iotests/common.config +1
-1@@ -1,4 +1,4 @@ -#!/usr/bin/env bash +# -*- emacs mode: sh -*-I thought my version:
Quoted 3 lines
# hey emacs, this file will be sourced by bash -*- mode: sh -*- was cuter, but that's not a requirement, and yours works ;)
I will not make any disputes on that! :)
Thanks for the reviews!
- Cleber.
Quoted 7 lines
Reviewed-by Eric Blake <[email protected]>--
Eric Blake, Principal Software Engineer
Red Hat, Inc. +1-919-301-3226
Virtualization: qemu.org | libvirt.org
Re: [PATCH v2 1/4] qemu-iotests: remove bash shebang from library files
In reply to Cleber RosaAm 09.10.2019 um 21:47 hat Cleber Rosa geschrieben:
Quoted 5 lines
Due to not being able to find a reason to have shebangs on files that are not executable.
While at it, add a mode hint to emacs, which would be clueless or plain wrong about these containing shell code.
vim still doesn't like the change.
Of course, we could also add another line for vim and for every other editor in use, but actually, I think I'd prefer just dropping this patch. It even makes each file a few bytes larger instead of saving something. Shebang lines are a shorter and more portable format indicator than the alternatives.
So I think in the end we have found a good reason to keep them. :-)
Kevin
Re: [PATCH v2 1/4] qemu-iotests: remove bash shebang from library files
Quoted 9 lines · On Fri, Oct 11, 2019, 12:36 Kevin Wolf <[email protected]> wrote:
Am 09.10.2019 um 21:47 hat Cleber Rosa geschrieben:
Quoted 5 lines
Due to not being able to find a reason to have shebangs on files that are not executable.
While at it, add a mode hint to emacs, which would be clueless or plain wrong about these containing shell code.
vim still doesn't like the change.
Quoted 8 lines
Of course, we could also add another line for vim and for every other editor in use, but actually, I think I'd prefer just dropping this patch. It even makes each file a few bytes larger instead of saving something. Shebang lines are a shorter and more portable format indicator than the alternatives.
So I think in the end we have found a good reason to keep them. :-)
What about .sh suffix? Should be most portable way.
Quoted 1 line
Re: [PATCH v2 1/4] qemu-iotests: remove bash shebang from library files
Quoted 17 lines · Nir Soffer
Quoted 15 lines · On Fri, Oct 11, 2019, 12:36 Kevin Wolf <[email protected]> wrote:
Am 09.10.2019 um 21:47 hat Cleber Rosa geschrieben:
Quoted 5 lines
Due to not being able to find a reason to have shebangs on files that are not executable.
While at it, add a mode hint to emacs, which would be clueless or plain wrong about these containing shell code.
vim still doesn't like the change.
Of course, we could also add another line for vim and for every other editor in use, but actually, I think I'd prefer just dropping this patch. It even makes each file a few bytes larger instead of saving something. Shebang lines are a shorter and more portable format indicator than the alternatives.
Quoted 6 lines
Quoted 2 lines
So I think in the end we have found a good reason to keep them. :-)
What about .sh suffix? Should be most portable way.
Quoted 1 line
That's the approach I tend to follow for my sh code. Explicit is better than implicit if you ask me.
Kevin,
Do you have any strong feelings here? I'd be fine with either this or dropping the patch.
Thanks,
- Cleber.
Re: [PATCH v2 1/4] qemu-iotests: remove bash shebang from library files
Am 11.10.2019 um 22:05 hat Cleber Rosa geschrieben:
Quoted 18 lines · Nir Soffer
Quoted 17 lines · On Fri, Oct 11, 2019, 12:36 Kevin Wolf <[email protected]> wrote:
Quoted 16 lines
Am 09.10.2019 um 21:47 hat Cleber Rosa geschrieben:
Quoted 5 lines
Due to not being able to find a reason to have shebangs on files that are not executable.
While at it, add a mode hint to emacs, which would be clueless or plain wrong about these containing shell code.
vim still doesn't like the change.
Of course, we could also add another line for vim and for every other editor in use, but actually, I think I'd prefer just dropping this patch. It even makes each file a few bytes larger instead of saving something. Shebang lines are a shorter and more portable format indicator than the alternatives.
Quoted 6 lines
Quoted 3 lines
Quoted 1 line
So I think in the end we have found a good reason to keep them. :-)
What about .sh suffix? Should be most portable way.
That's the approach I tend to follow for my sh code. Explicit is better than implicit if you ask me.
I would certainly agree for new files.
Quoted 4 lines
Kevin,
Do you have any strong feelings here? I'd be fine with either this or dropping the patch.
No strong feelings. The result of renaming the files would be a bit nicer than what we have today, but renaming always comes with a cost when working with the version history later. Hard to tell if it's a net gain or loss in the end.
Myself, I would probably pick the lazy way and stick with "if it ain't broke, don't fix it", but I'm not objecting to a change either.
Kevin
PATCH v2 2/4 qemu-iotests: remove forceful execution success from library files
In reply to Cleber RosaShould not be necessary on files that are not executed standalone.
--- tests/qemu-iotests/common.config | 3 --- tests/qemu-iotests/common.filter | 3 --- tests/qemu-iotests/common.rc | 3 --- 3 files changed, 9 deletions(-)
tests/qemu-iotests/common.config +0 -3
@@ -36,6 +36,3 @@ _optstr_add() echo "$2" fi } - -# make sure this script returns success -true
tests/qemu-iotests/common.filter +0 -3
@@ -226,6 +226,3 @@ _filter_qmp_empty_return() { grep -v '{"return": {}}' } - -# make sure this script returns success -true
tests/qemu-iotests/common.rc +0 -3
@@ -602,6 +602,3 @@ _require_drivers() fi done } - -# make sure this script returns success -true
Signature · 1 line
2.21.0
Re: [PATCH v2 2/4] qemu-iotests: remove forceful execution success from library files
Am 09.10.2019 um 21:47 hat Cleber Rosa geschrieben:
Quoted 4 lines
Should not be necessary on files that are not executed standalone.
Reviewed-by Eric Blake <[email protected]>Signed-off-by Cleber Rosa <[email protected]>
Looks fine for common.filter and common.rc, nobody ever checks their return value.
common.config is included like this:
if ! . "$source_iotests/common.config" then
_init_error "failed to source common.config"
fi
So as long as we keep this, don't we want to make sure that it returns success?
Of course, we never really want to return an error from common.config, so instead of keeping the final 'true' statement, we might consider changing its inclusion to not check for errors. The case that potentially changes is when common.config doesn't exist or isn't readable, but this isn't supposed to ever happen anyway.
Kevin
PATCH v2 3/4 qemu-iotests: 044: pass is actually a noop, so remove it
In reply to Cleber Rosa--- tests/qemu-iotests/044 | 3 --- 1 file changed, 3 deletions(-)
tests/qemu-iotests/044 +0 -3
@@ -102,17 +102,14 @@ class TestRefcountTableGrowth(iotests.QMPTestCase): def setUp(self): qemu_img('create', '-f', iotests.imgfmt, '-o', 'cluster_size=512', test_img, '16G') self.preallocate(test_img) - pass def tearDown(self): os.remove(test_img) - pass def test_grow_refcount_table(self): qemu_io('-c', 'write 3800M 1M', test_img) qemu_img_verbose('check' , test_img) - pass if __name__ == '__main__': iotests.main(supported_fmts=['qcow2'],
Signature · 1 line
2.21.0
Re: [PATCH v2 3/4] qemu-iotests: 044: pass is actually a noop, so remove it
Quoted 19 lines · Cleber Rosa
Reviewed-by Eric Blake <[email protected]>Signed-off-by Cleber Rosa <[email protected]>--- tests/qemu-iotests/044 | 3 --- 1 file changed, 3 deletions(-)tests/qemu-iotests/044 +0
-1@@ -102,17 +102,14 @@ class TestRefcountTableGrowth(iotests.QMPTestCase): def setUp(self): qemu_img('create', '-f', iotests.imgfmt, '-o', 'cluster_size=512', test_img, '16G') self.preallocate(test_img) - pass def tearDown(self):
tests/qemu-iotests/044 class TestRefcountTableGrowth(iotests.QMPTestCase): · line 115
Quoted 10 lines
tests/qemu-iotests/044 +0
-2os.remove(test_img) - pass def test_grow_refcount_table(self): qemu_io('-c', 'write 3800M 1M', test_img) qemu_img_verbose('check' , test_img) - pass if __name__ == '__main__': iotests.main(supported_fmts=['qcow2'],
Re: [PATCH v2 3/4] qemu-iotests: 044: pass is actually a noop, so remove it
In reply to Cleber RosaAm 09.10.2019 um 21:47 hat Cleber Rosa geschrieben:
Quoted 2 lines
Reviewed-by Eric Blake <[email protected]>Signed-off-by Cleber Rosa <[email protected]>
PATCH v2 4/4 qemu-iotests: 044: remove inaccurate docstring class description
In reply to Cleber Rosa--- tests/qemu-iotests/044 | 1 - 1 file changed, 1 deletion(-)
tests/qemu-iotests/044 +0 -1
@@ -31,7 +31,6 @@ import sys test_img = os.path.join(iotests.test_dir, 'test.img') class TestRefcountTableGrowth(iotests.QMPTestCase): - '''Abstract base class for image mirroring test cases''' def preallocate(self, name): fd = open(name, "r+b")
Signature · 1 line
2.21.0
Re: [PATCH v2 4/4] qemu-iotests: 044: remove inaccurate docstring class description
Am 09.10.2019 um 21:47 hat Cleber Rosa geschrieben:
Quoted 3 lines
Reviewed-by Eric Blake <[email protected]>Reviewed-by John Snow <[email protected]>Signed-off-by Cleber Rosa <[email protected]>