From: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
To: Max Reitz <mreitz@redhat.com>,
"qemu-block@nongnu.org" <qemu-block@nongnu.org>
Cc: Kevin Wolf <kwolf@redhat.com>, Alberto Garcia <berto@igalia.com>,
"qemu-devel@nongnu.org" <qemu-devel@nongnu.org>
Subject: Re: [PATCH for-5.0 v2 18/23] iotests: Add VM.assert_block_path()
Date: Fri, 13 Dec 2019 11:26:04 +0000 [thread overview]
Message-ID: <4416b029-dbb2-280d-f2ee-67175a383871@virtuozzo.com> (raw)
In-Reply-To: <9c1e5973-aef5-20f3-86fd-1515e2977316@redhat.com>
09.12.2019 18:10, Max Reitz wrote:
> On 03.12.19 13:59, Vladimir Sementsov-Ogievskiy wrote:
>> 11.11.2019 19:02, Max Reitz wrote:
>>> Signed-off-by: Max Reitz <mreitz@redhat.com>
>>> ---
>>> tests/qemu-iotests/iotests.py | 59 +++++++++++++++++++++++++++++++++++
>>> 1 file changed, 59 insertions(+)
>>>
>>> diff --git a/tests/qemu-iotests/iotests.py b/tests/qemu-iotests/iotests.py
>>> index d34305ce69..3e03320ce3 100644
>>> --- a/tests/qemu-iotests/iotests.py
>>> +++ b/tests/qemu-iotests/iotests.py
>>> @@ -681,6 +681,65 @@ class VM(qtest.QEMUQtestMachine):
>>>
>>> return fields.items() <= ret.items()
>>>
>>> + """
>>> + Check whether the node under the given path in the block graph is
>>> + @expected_node.
>>> +
>>> + @root is the node name of the node where the @path is rooted.
>>> +
>>> + @path is a string that consists of child names separated by
>>> + slashes. It must begin with a slash.
>>
>> Why do you need this slash?
>
> I don’t. It just looked better to me.
>
> (One reason would be so it could be empty to refer to @root, but as I
> said that isn’t very useful.)
>
>> To stress that we are starting from root?
>> But root is not global, it's selected by previous argument, so for me the
>> path is more like relative than absolute..
>>
>>> +
>>> + Examples for @root + @path:
>>> + - root="qcow2-node", path="/backing/file"
>>> + - root="quorum-node", path="/children.2/file"
>>> +
>>> + Hypothetically, @path could be empty, in which case it would point
>>> + to @root. However, in practice this case is not useful and hence
>>> + not allowed.
>>
>> 1. path can't be empty, as accordingly to previous point, it must start with '/'
>
> Hence “hypothetically”.
>
>> 2. path can be '/', which does exactly what you don't allow, and I don't see,
>> where it is restricted in code
>
> No, it doesn’t. That refers to a child of @root with an empty name.
Hmm, yes, OK.
>
>>> +
>>> + @expected_node may be None.
>>
>> Which means that, we assert existence of the path except its last element,
>> yes? Worth mention this behavior here.
>
> “(All elements of the path but the leaf must still exist.)”? OK.
OK
>
>>> +
>>> + @graph may be None or the result of an x-debug-query-block-graph
>>> + call that has already been performed.
>>> + """
>>> + def assert_block_path(self, root, path, expected_node, graph=None):
>>> + if graph is None:
>>> + graph = self.qmp('x-debug-query-block-graph')['return']
>>> +
>>> + iter_path = iter(path.split('/'))
>>> +
>>> + # Must start with a /
>>> + assert next(iter_path) == ''
>>> +
>>> + node = next((node for node in graph['nodes'] if node['name'] == root),
>>> + None)
>>> +
>>> + for path_node in iter_path:
>>> + assert node is not None, 'Cannot follow path %s' % path
>>> +
>>> + try:
>>> + node_id = next(edge['child'] for edge in graph['edges'] \
>>> + if edge['parent'] == node['id'] and
>>> + edge['name'] == path_node)
>>> +
>>> + node = next(node for node in graph['nodes'] \
>>> + if node['id'] == node_id)
>>
>> this line cant fail. If it fail, it means a bug in x-debug-query-block-graph, so,
>> I'd prefer to move it out of try:except block.
>
> But that makes the code uglier, in my opinion. We’d then have to set
> node_id to e.g. None in the except branch (or rather just abolish the
> try-except then) and check whether it’s None before assigning node.
> Like this:
>
> node_id = next(..., None)
>
> if node_id is not None:
> node = next(...)
> else:
> node = None
>
> I prefer the current try-except construct over that.
OK
>
>>> + except StopIteration:
>>> + node = None
>>> +
>>> + assert node is not None or expected_node is None, \
>>> + 'No node found under %s (but expected %s)' % \
>>> + (path, expected_node)
>>> +
>>> + assert expected_node is not None or node is None, \
>>> + 'Found node %s under %s (but expected none)' % \
>>> + (node['name'], path)
>>> +
>>> + if node is not None and expected_node is not None:
>>
>> [1]
>> second part of condition already asserted by previous assertion
>
> Yes, but I wanted to cover all four cases explicitly. (In the usual 00,
> 01, 10, 11 manner. Well, except it’s 10, 01, 11, 00.)
>
>>> + assert node['name'] == expected_node, \
>>> + 'Found node %s under %s (but expected %s)' % \
>>> + (node['name'], path, expected_node)
>>
>> IMHO, it would be easier to read like:
>>
>> if node is None:
>> assert expected_node is None, \
>> 'No node found under %s (but expected %s)' % \
>> (path, expected_node)
>> else:
>> assert expected_node is not None, \
>> 'Found node %s under %s (but expected none)' % \
>> (node['name'], path)
>>
>> assert node['name'] == expected_node, \
>> 'Found node %s under %s (but expected %s)' % \
>> (node['name'], path, expected_node)
>>
>> Or even just
>>
>> if node is None:
>> assert expected_node is None, \
>> 'No node found under %s (but expected %s)' % \
>> (path, expected_node)
>> else:
>> assert node['name'] == expected_node, \
>> 'Found node %s under %s (but expected %s)' % \
>> (node['name'], path, expected_node)
>
> Works for me, too.
>
>> (I've checked:
>> >>> 'erger %s erg' % None
>> 'erger None erg'
>>
>> Also, %-style formatting is old, as I understand it's better always use .format()
>> )
>
> OK.
>
> Max
>
>>>
>>> index_re = re.compile(r'([^\[]+)\[([^\]]+)\]')
>>>
>>>
>
>
--
Best regards,
Vladimir
next prev parent reply other threads:[~2019-12-13 21:28 UTC|newest]
Thread overview: 75+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-11 16:01 [PATCH for-5.0 v2 00/23] block: Fix check_to_replace_node() Max Reitz
2019-11-11 16:01 ` [PATCH for-5.0 v2 01/23] blockdev: Allow external snapshots everywhere Max Reitz
2019-11-11 16:01 ` [PATCH for-5.0 v2 02/23] blockdev: Allow resizing everywhere Max Reitz
2019-12-06 14:04 ` Alberto Garcia
2019-12-09 13:56 ` Max Reitz
2019-11-11 16:01 ` [PATCH for-5.0 v2 03/23] block: Drop bdrv_is_first_non_filter() Max Reitz
2019-11-11 16:01 ` [PATCH for-5.0 v2 04/23] iotests: Let 041 use -blockdev for quorum children Max Reitz
2019-11-11 16:01 ` [PATCH for-5.0 v2 05/23] quorum: Fix child permissions Max Reitz
2019-11-29 9:14 ` Vladimir Sementsov-Ogievskiy
2019-11-11 16:01 ` [PATCH for-5.0 v2 06/23] block: Add bdrv_recurse_can_replace() Max Reitz
2019-11-29 9:34 ` Vladimir Sementsov-Ogievskiy
2019-11-29 10:23 ` Max Reitz
2019-11-29 11:04 ` Vladimir Sementsov-Ogievskiy
2019-11-11 16:02 ` [PATCH for-5.0 v2 07/23] blkverify: Implement .bdrv_recurse_can_replace() Max Reitz
2019-11-29 9:41 ` Vladimir Sementsov-Ogievskiy
2019-11-11 16:02 ` [PATCH for-5.0 v2 08/23] quorum: Store children in own structure Max Reitz
2019-11-29 9:46 ` Vladimir Sementsov-Ogievskiy
2019-11-11 16:02 ` [PATCH for-5.0 v2 09/23] quorum: Add QuorumChild.to_be_replaced Max Reitz
2019-11-29 9:59 ` Vladimir Sementsov-Ogievskiy
2019-11-11 16:02 ` [PATCH for-5.0 v2 10/23] quorum: Implement .bdrv_recurse_can_replace() Max Reitz
2019-11-29 10:18 ` Vladimir Sementsov-Ogievskiy
2019-11-29 12:50 ` Max Reitz
2020-02-05 15:55 ` Kevin Wolf
2020-02-05 16:03 ` Kevin Wolf
2020-02-06 10:21 ` Max Reitz
2020-02-06 14:42 ` Kevin Wolf
2020-02-06 15:19 ` Max Reitz
2020-02-06 15:42 ` Kevin Wolf
2020-02-06 16:44 ` Max Reitz
2019-11-11 16:02 ` [PATCH for-5.0 v2 11/23] block: Use bdrv_recurse_can_replace() Max Reitz
2019-11-29 11:07 ` Vladimir Sementsov-Ogievskiy
2020-02-05 15:57 ` Kevin Wolf
2019-11-11 16:02 ` [PATCH for-5.0 v2 12/23] block: Remove bdrv_recurse_is_first_non_filter() Max Reitz
2019-11-11 16:02 ` [PATCH for-5.0 v2 13/23] mirror: Double-check immediately before replacing Max Reitz
2019-11-29 11:18 ` Vladimir Sementsov-Ogievskiy
2019-11-11 16:02 ` [PATCH for-5.0 v2 14/23] quorum: Stop marking it as a filter Max Reitz
2019-11-11 16:02 ` [PATCH for-5.0 v2 15/23] mirror: Prevent loops Max Reitz
2019-11-29 12:01 ` Vladimir Sementsov-Ogievskiy
2019-11-29 13:46 ` Max Reitz
2019-11-29 13:55 ` Vladimir Sementsov-Ogievskiy
2019-11-29 14:17 ` Max Reitz
2019-11-29 14:26 ` Vladimir Sementsov-Ogievskiy
2019-11-29 14:38 ` Max Reitz
2019-12-02 12:12 ` Vladimir Sementsov-Ogievskiy
2019-12-09 14:43 ` Max Reitz
2019-12-13 11:18 ` Vladimir Sementsov-Ogievskiy
2019-12-20 11:39 ` Max Reitz
2019-12-20 11:55 ` Vladimir Sementsov-Ogievskiy
2019-12-20 12:10 ` Max Reitz
2019-11-11 16:02 ` [PATCH for-5.0 v2 16/23] iotests: Use complete_and_wait() in 155 Max Reitz
2019-11-11 16:02 ` [PATCH for-5.0 v2 17/23] iotests: Use skip_if_unsupported decorator in 041 Max Reitz
2019-12-03 12:03 ` Vladimir Sementsov-Ogievskiy
2019-11-11 16:02 ` [PATCH for-5.0 v2 18/23] iotests: Add VM.assert_block_path() Max Reitz
2019-12-03 12:59 ` Vladimir Sementsov-Ogievskiy
2019-12-09 15:10 ` Max Reitz
2019-12-13 11:26 ` Vladimir Sementsov-Ogievskiy [this message]
2019-12-13 11:27 ` Vladimir Sementsov-Ogievskiy
2019-12-20 11:42 ` Max Reitz
2019-11-11 16:02 ` [PATCH for-5.0 v2 19/23] iotests: Resolve TODOs in 041 Max Reitz
2019-12-03 13:32 ` Vladimir Sementsov-Ogievskiy
2019-12-03 13:33 ` Vladimir Sementsov-Ogievskiy
2019-12-09 15:15 ` Max Reitz
2019-12-13 11:31 ` Vladimir Sementsov-Ogievskiy
2019-11-11 16:02 ` [PATCH for-5.0 v2 20/23] iotests: Use self.image_len in TestRepairQuorum Max Reitz
2019-11-11 16:02 ` [PATCH for-5.0 v2 21/23] iotests: Add tests for invalid Quorum @replaces Max Reitz
2019-12-03 14:40 ` Vladimir Sementsov-Ogievskiy
2019-11-11 16:02 ` [PATCH for-5.0 v2 22/23] iotests: Check that @replaces can replace filters Max Reitz
2019-12-03 15:58 ` Vladimir Sementsov-Ogievskiy
2019-12-09 15:17 ` Max Reitz
2019-11-11 16:02 ` [PATCH for-5.0 v2 23/23] iotests: Mirror must not attempt to create loops Max Reitz
2019-12-03 17:03 ` Vladimir Sementsov-Ogievskiy
2019-11-29 12:24 ` [PATCH for-5.0 v2 00/23] block: Fix check_to_replace_node() Vladimir Sementsov-Ogievskiy
2019-11-29 12:49 ` Max Reitz
2019-11-29 12:55 ` Vladimir Sementsov-Ogievskiy
2019-11-29 13:08 ` Max Reitz
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4416b029-dbb2-280d-f2ee-67175a383871@virtuozzo.com \
--to=vsementsov@virtuozzo.com \
--cc=berto@igalia.com \
--cc=kwolf@redhat.com \
--cc=mreitz@redhat.com \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).