Message ID | 20181214231512.5295-1-jsnow@redhat.com (mailing list archive) |
---|---|
Headers | show |
Series | bitmaps: remove x- prefix from QMP api | expand |
15.12.2018 2:15, John Snow wrote: > To mimic the common filter of the same name, but for the python tests. > > Signed-off-by: John Snow <jsnow@redhat.com. oops, '.' -> '>' and also, strange CC line in header, including "John Snow <jsnow@redhat.com>, John" > Reviewed-by: Eric Blake <eblake@redhat.com> > Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com> > --- > tests/qemu-iotests/iotests.py | 3 +++ > 1 file changed, 3 insertions(+) > > diff --git a/tests/qemu-iotests/iotests.py b/tests/qemu-iotests/iotests.py > index a34e66813a..9595429fea 100644 > --- a/tests/qemu-iotests/iotests.py > +++ b/tests/qemu-iotests/iotests.py > @@ -239,6 +239,9 @@ def filter_testfiles(msg): > prefix = os.path.join(test_dir, "%s-" % (os.getpid())) > return msg.replace(prefix, 'TEST_DIR/PID-') > > +def filter_generated_node_ids(msg): > + return re.sub("#block[0-9]+", "NODE_NAME", msg) > + > def filter_img_info(output, filename): > lines = [] > for line in output.split('\n'): >
On 12/14/18 6:15 PM, John Snow wrote: > Touch up a few last things and remove the x- prefix. > > V3: > - Reworked qmp_log to pretty-print the outgoing command, too [Vladimir] > - Modified test to log only bitmap information [Vladimir] > - Test disable/enable transaction toggle [Eric] > > Note that the filter I added is now unused, but I think we will want it > and it's small enough, so I'm going to check it in anyway. If you disagree, > I'll just drop the patch instead. > > --js > > John Snow (7): > blockdev: abort transactions in reverse order > blockdev: n-ary bitmap merge > block: remove 'x' prefix from experimental bitmap APIs > iotests.py: don't abort if IMGKEYSECRET is undefined > iotests: add filter_generated_node_ids > iotests: allow pretty-print for qmp_log > iotests: add iotest 236 for testing bitmap merge > > blockdev.c | 96 +++++++++------- > qapi/block-core.json | 56 +++++----- > qapi/transaction.json | 12 +- > tests/qemu-iotests/223 | 4 +- > tests/qemu-iotests/236 | 124 +++++++++++++++++++++ > tests/qemu-iotests/236.out | 200 ++++++++++++++++++++++++++++++++++ > tests/qemu-iotests/group | 1 + > tests/qemu-iotests/iotests.py | 22 +++- > 8 files changed, 436 insertions(+), 79 deletions(-) > create mode 100755 tests/qemu-iotests/236 > create mode 100644 tests/qemu-iotests/236.out > Thanks, I'm staging patches 1-5 and I'll send the PR once we get to the bottom of patches 6 and 7, just to keep volume on the list down. --js
On 12/17/18 4:14 PM, John Snow wrote: > > > On 12/14/18 6:15 PM, John Snow wrote: >> Touch up a few last things and remove the x- prefix. >> >> V3: >> - Reworked qmp_log to pretty-print the outgoing command, too [Vladimir] >> - Modified test to log only bitmap information [Vladimir] >> - Test disable/enable transaction toggle [Eric] >> >> Note that the filter I added is now unused, but I think we will want it >> and it's small enough, so I'm going to check it in anyway. If you disagree, >> I'll just drop the patch instead. >> >> --js >> >> John Snow (7): >> blockdev: abort transactions in reverse order >> blockdev: n-ary bitmap merge >> block: remove 'x' prefix from experimental bitmap APIs >> iotests.py: don't abort if IMGKEYSECRET is undefined >> iotests: add filter_generated_node_ids >> iotests: allow pretty-print for qmp_log >> iotests: add iotest 236 for testing bitmap merge >> >> blockdev.c | 96 +++++++++------- >> qapi/block-core.json | 56 +++++----- >> qapi/transaction.json | 12 +- >> tests/qemu-iotests/223 | 4 +- >> tests/qemu-iotests/236 | 124 +++++++++++++++++++++ >> tests/qemu-iotests/236.out | 200 ++++++++++++++++++++++++++++++++++ >> tests/qemu-iotests/group | 1 + >> tests/qemu-iotests/iotests.py | 22 +++- >> 8 files changed, 436 insertions(+), 79 deletions(-) >> create mode 100755 tests/qemu-iotests/236 >> create mode 100644 tests/qemu-iotests/236.out >> > > Thanks, I'm staging patches 1-5 and I'll send the PR once we get to the > bottom of patches 6 and 7, just to keep volume on the list down. > NACK. Patch 2 is incomplete an additional bugfix is needed. --js
Patchew URL: https://patchew.org/QEMU/20181214231512.5295-1-jsnow@redhat.com/ Hi, This series seems to have some coding style problems. See output below for more information: Message-id: 20181214231512.5295-1-jsnow@redhat.com Type: series Subject: [Qemu-devel] [PATCH v3 0/7] bitmaps: remove x- prefix from QMP api === TEST SCRIPT BEGIN === #!/bin/bash BASE=base n=1 total=$(git log --oneline $BASE.. | wc -l) failed=0 git config --local diff.renamelimit 0 git config --local diff.renames True git config --local diff.algorithm histogram commits="$(git log --format=%H --reverse $BASE..)" for c in $commits; do echo "Checking PATCH $n/$total: $(git log -n 1 --format=%s $c)..." if ! git show $c --format=email | ./scripts/checkpatch.pl --mailback -; then failed=1 echo fi n=$((n+1)) done exit $failed === TEST SCRIPT END === Updating 3c8cf5a9c21ff8782164d1def7f44bd888713384 Switched to a new branch 'test' 24334c9 iotests: add iotest 236 for testing bitmap merge 4a6a51f iotests: allow pretty-print for qmp_log 196c922 iotests: add filter_generated_node_ids eae2953 iotests.py: don't abort if IMGKEYSECRET is undefined 6aaaafa block: remove 'x' prefix from experimental bitmap APIs 14c3ee1 blockdev: n-ary bitmap merge 24d5528 blockdev: abort transactions in reverse order === OUTPUT BEGIN === Checking PATCH 1/7: blockdev: abort transactions in reverse order... Checking PATCH 2/7: blockdev: n-ary bitmap merge... ERROR: externs should be avoided in .c files #28: FILE: blockdev.c:2125: +void do_block_dirty_bitmap_merge(const char *node, const char *target, total: 1 errors, 0 warnings, 147 lines checked Your patch has style problems, please review. If any of these errors are false positives report them to the maintainer, see CHECKPATCH in MAINTAINERS. Checking PATCH 3/7: block: remove 'x' prefix from experimental bitmap APIs... Checking PATCH 4/7: iotests.py: don't abort if IMGKEYSECRET is undefined... Checking PATCH 5/7: iotests: add filter_generated_node_ids... Checking PATCH 6/7: iotests: allow pretty-print for qmp_log... Checking PATCH 7/7: iotests: add iotest 236 for testing bitmap merge... === OUTPUT END === Test command exited with code: 1 The full log is available at http://patchew.org/logs/20181214231512.5295-1-jsnow@redhat.com/testing.checkpatch/?type=message. --- Email generated automatically by Patchew [http://patchew.org/]. Please send your feedback to patchew-devel@redhat.com