[v2,00/21] iotests: Allow ./check -o data_file
mbox series

Message ID 20191015142729.18123-1-mreitz@redhat.com
Headers show
Series
  • iotests: Allow ./check -o data_file
Related show

Message

Max Reitz Oct. 15, 2019, 2:27 p.m. UTC
Hi,

The cover letter from v1 (explaining the motivation behind this series
and the general structure) is here:

https://lists.nongnu.org/archive/html/qemu-block/2019-09/msg01323.html


For v2, I’ve tried to address Maxim’s comments:
- Patch 1 through 3: New
- Patch 4: Only print feature bits instead of blacklisting stuff that we
           don’t need
- Patch 5:
  - Fix typo
  - Add comment why 098 needs compat=1.1
- Patch 16: Use _check_test_img
- Patch 17: Use the new _filter_json_filename
- Patch 18: Rethink the incompatible feature filter approach: Instead of
            filtering out the data_file bit, just check whether the
            dirty bit is present (because that is all we want to know)
- Patch 19: Use the new _filter_json_filename
- Patch 20: Rebase conflicts due to the changes to patch 5
- Patch 21:
  - Add and use _get_data_file
  - Add a comment how the data_file_filter in _filter_qemu_img_map works


git-backport-diff against v1:

Key:
[----] : patches are identical
[####] : number of functional differences between upstream/downstream patch
[down] : patch is downstream-only
The flags [FC] indicate (F)unctional and (C)ontextual differences, respectively

001/21:[down] 'iotests/qcow2.py: Add dump-header-exts'
002/21:[down] 'iotests/qcow2.py: Split feature fields into bits'
003/21:[down] 'iotests: Add _filter_json_filename'
004/21:[0060] [FC] 'iotests: Filter refcount_order in 036'
005/21:[0003] [FC] 'iotests: Replace IMGOPTS by _unsupported_imgopts'
006/21:[----] [--] 'iotests: Drop compat=1.1 in 050'
007/21:[----] [--] 'iotests: Let _make_test_img parse its parameters'
008/21:[----] [--] 'iotests: Add -o and --no-opts to _make_test_img'
009/21:[----] [--] 'iotests: Inject space into -ocompat=0.10 in 051'
010/21:[----] [--] 'iotests: Replace IMGOPTS= by -o'
011/21:[----] [--] 'iotests: Replace IMGOPTS='' by --no-opts'
012/21:[----] [--] 'iotests: Drop IMGOPTS use in 267'
013/21:[----] [--] 'iotests: Avoid qemu-img create'
014/21:[----] [--] 'iotests: Use _rm_test_img for deleting test images'
015/21:[----] [--] 'iotests: Avoid cp/mv of test images'
016/21:[0004] [FC] 'iotests: Make 091 work with data_file'
017/21:[0004] [FC] 'iotests: Make 110 work with data_file'
018/21:[0002] [FC] 'iotests: Make 137 work with data_file'
019/21:[0004] [FC] 'iotests: Make 198 work with data_file'
020/21:[0002] [FC] 'iotests: Disable data_file where it cannot be used'
021/21:[0034] [FC] 'iotests: Allow check -o data_file'


Max Reitz (21):
  iotests/qcow2.py: Add dump-header-exts
  iotests/qcow2.py: Split feature fields into bits
  iotests: Add _filter_json_filename
  iotests: Filter refcount_order in 036
  iotests: Replace IMGOPTS by _unsupported_imgopts
  iotests: Drop compat=1.1 in 050
  iotests: Let _make_test_img parse its parameters
  iotests: Add -o and --no-opts to _make_test_img
  iotests: Inject space into -ocompat=0.10 in 051
  iotests: Replace IMGOPTS= by -o
  iotests: Replace IMGOPTS='' by --no-opts
  iotests: Drop IMGOPTS use in 267
  iotests: Avoid qemu-img create
  iotests: Use _rm_test_img for deleting test images
  iotests: Avoid cp/mv of test images
  iotests: Make 091 work with data_file
  iotests: Make 110 work with data_file
  iotests: Make 137 work with data_file
  iotests: Make 198 work with data_file
  iotests: Disable data_file where it cannot be used
  iotests: Allow check -o data_file

 tests/qemu-iotests/005           |  2 +-
 tests/qemu-iotests/007           |  5 ++-
 tests/qemu-iotests/014           |  2 +
 tests/qemu-iotests/015           |  5 ++-
 tests/qemu-iotests/019           |  6 +--
 tests/qemu-iotests/020           |  6 +--
 tests/qemu-iotests/024           | 10 ++---
 tests/qemu-iotests/026           |  5 ++-
 tests/qemu-iotests/028           |  2 +-
 tests/qemu-iotests/029           |  7 ++--
 tests/qemu-iotests/031           |  9 ++--
 tests/qemu-iotests/031.out       | 36 ++++++++--------
 tests/qemu-iotests/036           | 15 ++++---
 tests/qemu-iotests/036.out       | 66 ++++-------------------------
 tests/qemu-iotests/039           | 27 +++++-------
 tests/qemu-iotests/039.out       | 22 +++++-----
 tests/qemu-iotests/043           |  4 +-
 tests/qemu-iotests/046           |  2 +
 tests/qemu-iotests/048           |  4 +-
 tests/qemu-iotests/050           |  8 +---
 tests/qemu-iotests/051           |  7 ++--
 tests/qemu-iotests/053           |  4 +-
 tests/qemu-iotests/058           |  7 ++--
 tests/qemu-iotests/059           | 20 ++++-----
 tests/qemu-iotests/060           | 12 +++---
 tests/qemu-iotests/060.out       | 20 ++++-----
 tests/qemu-iotests/061           | 61 ++++++++++++++-------------
 tests/qemu-iotests/061.out       | 72 ++++++++++++++++----------------
 tests/qemu-iotests/062           |  3 +-
 tests/qemu-iotests/063           | 18 ++++----
 tests/qemu-iotests/063.out       |  3 +-
 tests/qemu-iotests/066           |  3 +-
 tests/qemu-iotests/067           |  6 ++-
 tests/qemu-iotests/068           |  4 +-
 tests/qemu-iotests/069           |  2 +-
 tests/qemu-iotests/071           |  7 +++-
 tests/qemu-iotests/073           |  2 +
 tests/qemu-iotests/074           |  4 +-
 tests/qemu-iotests/079           |  3 +-
 tests/qemu-iotests/080           |  7 ++--
 tests/qemu-iotests/081           |  6 +--
 tests/qemu-iotests/085           | 18 ++++----
 tests/qemu-iotests/085.out       |  8 ++--
 tests/qemu-iotests/088           |  2 +-
 tests/qemu-iotests/090           |  2 +
 tests/qemu-iotests/091           |  2 +-
 tests/qemu-iotests/091.out       |  2 -
 tests/qemu-iotests/092           |  2 +-
 tests/qemu-iotests/094           |  4 +-
 tests/qemu-iotests/095           |  5 ++-
 tests/qemu-iotests/098           |  6 ++-
 tests/qemu-iotests/099           | 10 +++--
 tests/qemu-iotests/103           |  5 ++-
 tests/qemu-iotests/106           |  2 +-
 tests/qemu-iotests/108           |  8 ++--
 tests/qemu-iotests/109           |  4 +-
 tests/qemu-iotests/110           | 11 +++--
 tests/qemu-iotests/110.out       |  4 +-
 tests/qemu-iotests/111           |  3 +-
 tests/qemu-iotests/112           | 37 ++++++++--------
 tests/qemu-iotests/114           |  2 +
 tests/qemu-iotests/115           |  3 +-
 tests/qemu-iotests/121           |  9 ++--
 tests/qemu-iotests/122           |  6 ++-
 tests/qemu-iotests/123           |  4 +-
 tests/qemu-iotests/125           |  2 +-
 tests/qemu-iotests/137           | 17 +++++---
 tests/qemu-iotests/137.out       |  6 +--
 tests/qemu-iotests/138           |  5 ++-
 tests/qemu-iotests/141           |  4 +-
 tests/qemu-iotests/142           |  2 +-
 tests/qemu-iotests/144           |  4 +-
 tests/qemu-iotests/153           | 12 ++----
 tests/qemu-iotests/156           | 10 ++++-
 tests/qemu-iotests/159           |  2 +-
 tests/qemu-iotests/160           |  3 +-
 tests/qemu-iotests/161           |  4 +-
 tests/qemu-iotests/170           |  2 +-
 tests/qemu-iotests/172           |  6 +--
 tests/qemu-iotests/173           |  3 +-
 tests/qemu-iotests/174           |  2 +-
 tests/qemu-iotests/175           |  2 +-
 tests/qemu-iotests/176           |  7 +++-
 tests/qemu-iotests/178           |  6 +--
 tests/qemu-iotests/182           |  2 +-
 tests/qemu-iotests/183           |  2 +-
 tests/qemu-iotests/185           |  4 +-
 tests/qemu-iotests/187           |  6 +--
 tests/qemu-iotests/190           |  4 +-
 tests/qemu-iotests/191           | 11 ++---
 tests/qemu-iotests/195           |  2 +-
 tests/qemu-iotests/197           |  6 +--
 tests/qemu-iotests/198           |  6 ++-
 tests/qemu-iotests/198.out       |  4 +-
 tests/qemu-iotests/200           |  7 ++--
 tests/qemu-iotests/201           |  6 +--
 tests/qemu-iotests/214           |  3 +-
 tests/qemu-iotests/215           |  6 +--
 tests/qemu-iotests/217           |  3 +-
 tests/qemu-iotests/220           |  5 ++-
 tests/qemu-iotests/225           |  2 +-
 tests/qemu-iotests/229           |  3 +-
 tests/qemu-iotests/232           |  4 +-
 tests/qemu-iotests/243           | 10 +++--
 tests/qemu-iotests/244           | 15 ++++---
 tests/qemu-iotests/247           |  4 +-
 tests/qemu-iotests/249           |  4 +-
 tests/qemu-iotests/250           |  5 ++-
 tests/qemu-iotests/252           |  2 +-
 tests/qemu-iotests/265           |  2 +-
 tests/qemu-iotests/267           | 17 +++++---
 tests/qemu-iotests/common.filter | 47 ++++++++++++++++++++-
 tests/qemu-iotests/common.rc     | 63 ++++++++++++++++++++++++----
 tests/qemu-iotests/qcow2.py      | 23 ++++++++--
 114 files changed, 599 insertions(+), 451 deletions(-)

Comments

no-reply@patchew.org Oct. 16, 2019, 12:19 a.m. UTC | #1
Patchew URL: https://patchew.org/QEMU/20191015142729.18123-1-mreitz@redhat.com/



Hi,

This series seems to have some coding style problems. See output below for
more information:

Subject: [PATCH v2 00/21] iotests: Allow ./check -o data_file
Type: series
Message-id: 20191015142729.18123-1-mreitz@redhat.com

=== TEST SCRIPT BEGIN ===
#!/bin/bash
git rev-parse base > /dev/null || exit 0
git config --local diff.renamelimit 0
git config --local diff.renames True
git config --local diff.algorithm histogram
./scripts/checkpatch.pl --mailback base..
=== TEST SCRIPT END ===

Updating 3c8cf5a9c21ff8782164d1def7f44bd888713384
Switched to a new branch 'test'
7e75916 iotests: Allow check -o data_file
a21918d iotests: Disable data_file where it cannot be used
1eb7209 iotests: Make 198 work with data_file
02453ff iotests: Make 137 work with data_file
cdb651c iotests: Make 110 work with data_file
1b30e90 iotests: Make 091 work with data_file
26ebffa iotests: Avoid cp/mv of test images
5d6ba79 iotests: Use _rm_test_img for deleting test images
4c20fa0 iotests: Avoid qemu-img create
944555b iotests: Drop IMGOPTS use in 267
9037b83 iotests: Replace IMGOPTS='' by --no-opts
e62282b iotests: Replace IMGOPTS= by -o
26d39b5 iotests: Inject space into -ocompat=0.10 in 051
99d129e iotests: Add -o and --no-opts to _make_test_img
301f2c3 iotests: Let _make_test_img parse its parameters
53a8dea iotests: Drop compat=1.1 in 050
85b18f8 iotests: Replace IMGOPTS by _unsupported_imgopts
476fb23 iotests: Filter refcount_order in 036
67b9119 iotests: Add _filter_json_filename
fbf9402 iotests/qcow2.py: Split feature fields into bits
afe3486 iotests/qcow2.py: Add dump-header-exts

=== OUTPUT BEGIN ===
1/21 Checking commit afe348661672 (iotests/qcow2.py: Add dump-header-exts)
ERROR: line over 90 characters
#32: FILE: tests/qemu-iotests/qcow2.py:237:
+    [ 'dump-header-exts',     cmd_dump_header_exts,     0, 'Dump image header extensions' ],

total: 1 errors, 0 warnings, 17 lines checked

Patch 1/21 has style problems, please review.  If any of these errors
are false positives report them to the maintainer, see
CHECKPATCH in MAINTAINERS.

2/21 Checking commit fbf940255d05 (iotests/qcow2.py: Split feature fields into bits)
3/21 Checking commit 67b9119032ad (iotests: Add _filter_json_filename)
4/21 Checking commit 476fb233c777 (iotests: Filter refcount_order in 036)
5/21 Checking commit 85b18f83a826 (iotests: Replace IMGOPTS by _unsupported_imgopts)
6/21 Checking commit 53a8dea8fb7b (iotests: Drop compat=1.1 in 050)
7/21 Checking commit 301f2c32204c (iotests: Let _make_test_img parse its parameters)
8/21 Checking commit 99d129e91dbe (iotests: Add -o and --no-opts to _make_test_img)
9/21 Checking commit 26d39b59dfe1 (iotests: Inject space into -ocompat=0.10 in 051)
10/21 Checking commit e62282b2ad38 (iotests: Replace IMGOPTS= by -o)
11/21 Checking commit 9037b83425c4 (iotests: Replace IMGOPTS='' by --no-opts)
12/21 Checking commit 944555b5c283 (iotests: Drop IMGOPTS use in 267)
13/21 Checking commit 4c20fa09b6c5 (iotests: Avoid qemu-img create)
14/21 Checking commit 5d6ba791204b (iotests: Use _rm_test_img for deleting test images)
15/21 Checking commit 26ebffafbd87 (iotests: Avoid cp/mv of test images)
16/21 Checking commit 1b30e9035908 (iotests: Make 091 work with data_file)
17/21 Checking commit cdb651c3c22b (iotests: Make 110 work with data_file)
18/21 Checking commit 02453ff71311 (iotests: Make 137 work with data_file)
19/21 Checking commit 1eb720910a65 (iotests: Make 198 work with data_file)
20/21 Checking commit a21918dcdf92 (iotests: Disable data_file where it cannot be used)
21/21 Checking commit 7e7591696382 (iotests: Allow check -o data_file)
=== OUTPUT END ===

Test command exited with code: 1


The full log is available at
http://patchew.org/logs/20191015142729.18123-1-mreitz@redhat.com/testing.checkpatch/?type=message.
---
Email generated automatically by Patchew [https://patchew.org/].
Please send your feedback to patchew-devel@redhat.com
Max Reitz Oct. 16, 2019, 7:18 a.m. UTC | #2
On 16.10.19 02:19, no-reply@patchew.org wrote:
> Patchew URL: https://patchew.org/QEMU/20191015142729.18123-1-mreitz@redhat.com/
> 
> 
> 
> Hi,
> 
> This series seems to have some coding style problems. See output below for
> more information:
> 
> Subject: [PATCH v2 00/21] iotests: Allow ./check -o data_file
> Type: series
> Message-id: 20191015142729.18123-1-mreitz@redhat.com
> 
> === TEST SCRIPT BEGIN ===
> #!/bin/bash
> git rev-parse base > /dev/null || exit 0
> git config --local diff.renamelimit 0
> git config --local diff.renames True
> git config --local diff.algorithm histogram
> ./scripts/checkpatch.pl --mailback base..
> === TEST SCRIPT END ===
> 
> Updating 3c8cf5a9c21ff8782164d1def7f44bd888713384
> Switched to a new branch 'test'
> 7e75916 iotests: Allow check -o data_file
> a21918d iotests: Disable data_file where it cannot be used
> 1eb7209 iotests: Make 198 work with data_file
> 02453ff iotests: Make 137 work with data_file
> cdb651c iotests: Make 110 work with data_file
> 1b30e90 iotests: Make 091 work with data_file
> 26ebffa iotests: Avoid cp/mv of test images
> 5d6ba79 iotests: Use _rm_test_img for deleting test images
> 4c20fa0 iotests: Avoid qemu-img create
> 944555b iotests: Drop IMGOPTS use in 267
> 9037b83 iotests: Replace IMGOPTS='' by --no-opts
> e62282b iotests: Replace IMGOPTS= by -o
> 26d39b5 iotests: Inject space into -ocompat=0.10 in 051
> 99d129e iotests: Add -o and --no-opts to _make_test_img
> 301f2c3 iotests: Let _make_test_img parse its parameters
> 53a8dea iotests: Drop compat=1.1 in 050
> 85b18f8 iotests: Replace IMGOPTS by _unsupported_imgopts
> 476fb23 iotests: Filter refcount_order in 036
> 67b9119 iotests: Add _filter_json_filename
> fbf9402 iotests/qcow2.py: Split feature fields into bits
> afe3486 iotests/qcow2.py: Add dump-header-exts
> 
> === OUTPUT BEGIN ===
> 1/21 Checking commit afe348661672 (iotests/qcow2.py: Add dump-header-exts)
> ERROR: line over 90 characters
> #32: FILE: tests/qemu-iotests/qcow2.py:237:
> +    [ 'dump-header-exts',     cmd_dump_header_exts,     0, 'Dump image header extensions' ],
> 
> total: 1 errors, 0 warnings, 17 lines checked

I actually saw this error locally but decided to go with it because it
fits the current style of qcow2.py in that place.  (And I don’t think
the line length does any harm there.)

Max
Maxim Levitsky Nov. 6, 2019, 3:52 p.m. UTC | #3
On Tue, 2019-10-15 at 16:27 +0200, Max Reitz wrote:
> Hi,
> 
> The cover letter from v1 (explaining the motivation behind this series
> and the general structure) is here:
> 
> https://lists.nongnu.org/archive/html/qemu-block/2019-09/msg01323.html
> 
> 
> For v2, I’ve tried to address Maxim’s comments:
> - Patch 1 through 3: New
> - Patch 4: Only print feature bits instead of blacklisting stuff that we
>            don’t need
> - Patch 5:
>   - Fix typo
>   - Add comment why 098 needs compat=1.1
> - Patch 16: Use _check_test_img
> - Patch 17: Use the new _filter_json_filename
> - Patch 18: Rethink the incompatible feature filter approach: Instead of
>             filtering out the data_file bit, just check whether the
>             dirty bit is present (because that is all we want to know)
> - Patch 19: Use the new _filter_json_filename
> - Patch 20: Rebase conflicts due to the changes to patch 5
> - Patch 21:
>   - Add and use _get_data_file
>   - Add a comment how the data_file_filter in _filter_qemu_img_map works
> 

Thank you! I reviewed the series, and it looks fine now.
Best regards,
	Maxim Levitsky