From: Kevin Wolf <kwolf@redhat.com>
To: qemu-block@nongnu.org
Cc: kwolf@redhat.com, peter.maydell@linaro.org, qemu-devel@nongnu.org
Subject: [PULL 31/36] iotests: Add VM.assert_block_path()
Date: Tue, 18 Feb 2020 15:07:17 +0100 [thread overview]
Message-ID: <20200218140722.23876-32-kwolf@redhat.com> (raw)
In-Reply-To: <20200218140722.23876-1-kwolf@redhat.com>
From: Max Reitz <mreitz@redhat.com>
Signed-off-by: Max Reitz <mreitz@redhat.com>
Message-Id: <20200218103454.296704-15-mreitz@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@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 0473e824ed..8815052eb5 100644
--- a/tests/qemu-iotests/iotests.py
+++ b/tests/qemu-iotests/iotests.py
@@ -714,6 +714,65 @@ class VM(qtest.QEMUQtestMachine):
return fields.items() <= ret.items()
+ def assert_block_path(self, root, path, expected_node, graph=None):
+ """
+ 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.
+
+ 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.
+
+ @expected_node may be None. (All elements of the path but the
+ leaf must still exist.)
+
+ @graph may be None or the result of an x-debug-query-block-graph
+ call that has already been performed.
+ """
+ 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)
+
+ # An empty @path is not allowed, so the root node must be present
+ assert node is not None, 'Root node %s not found' % root
+
+ for child_name in iter_path:
+ assert node is not None, 'Cannot follow path %s%s' % (root, path)
+
+ try:
+ node_id = next(edge['child'] for edge in graph['edges'] \
+ if edge['parent'] == node['id'] and
+ edge['name'] == child_name)
+
+ node = next(node for node in graph['nodes'] \
+ if node['id'] == node_id)
+ except StopIteration:
+ node = None
+
+ 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)
index_re = re.compile(r'([^\[]+)\[([^\]]+)\]')
--
2.20.1
next prev parent reply other threads:[~2020-02-18 14:26 UTC|newest]
Thread overview: 38+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-02-18 14:06 [PULL 00/36] Block layer patches Kevin Wolf
2020-02-18 14:06 ` [PULL 01/36] mirror: Store MirrorOp.co for debuggability Kevin Wolf
2020-02-18 14:06 ` [PULL 02/36] mirror: Don't let an operation wait for itself Kevin Wolf
2020-02-18 14:06 ` [PULL 03/36] qcow2: Fix alignment checks in encrypted images Kevin Wolf
2020-02-18 14:06 ` [PULL 04/36] block/vvfat: Do not unref qcow on closing backing bdrv Kevin Wolf
2020-02-18 14:06 ` [PULL 05/36] qcow2: update_refcount(): Reset old_table_index after qcow2_cache_put() Kevin Wolf
2020-02-18 14:06 ` [PULL 06/36] qcow2: Fix qcow2_alloc_cluster_abort() for external data file Kevin Wolf
2020-02-18 14:06 ` [PULL 07/36] iotests: Test copy offloading with " Kevin Wolf
2020-02-18 14:06 ` [PULL 08/36] block/qcow2-bitmap: Remove unneeded variable assignment Kevin Wolf
2020-02-18 14:06 ` [PULL 09/36] qapi: Document meaning of 'ignore' BlockdevOnError for jobs Kevin Wolf
2020-02-18 14:06 ` [PULL 10/36] commit: Remove unused bytes_written Kevin Wolf
2020-02-18 14:06 ` [PULL 11/36] commit: Fix argument order for block_job_error_action() Kevin Wolf
2020-02-18 14:06 ` [PULL 12/36] commit: Inline commit_populate() Kevin Wolf
2020-02-18 14:06 ` [PULL 13/36] commit: Fix is_read for block_job_error_action() Kevin Wolf
2020-02-18 14:07 ` [PULL 14/36] commit: Expose on-error option in QMP Kevin Wolf
2020-02-18 14:07 ` [PULL 15/36] iotests: Test error handling policies with block-commit Kevin Wolf
2020-02-18 14:07 ` [PULL 16/36] block: Remove superfluous semicolons Kevin Wolf
2020-02-18 14:07 ` [PULL 17/36] block/io_uring: Remove superfluous semicolon Kevin Wolf
2020-02-18 14:07 ` [PULL 18/36] blockdev: Allow external snapshots everywhere Kevin Wolf
2020-02-18 14:07 ` [PULL 19/36] blockdev: Allow resizing everywhere Kevin Wolf
2020-02-18 14:07 ` [PULL 20/36] block: Drop bdrv_is_first_non_filter() Kevin Wolf
2020-02-18 14:07 ` [PULL 21/36] iotests: Let 041 use -blockdev for quorum children Kevin Wolf
2020-02-18 14:07 ` [PULL 22/36] quorum: Fix child permissions Kevin Wolf
2020-02-18 14:07 ` [PULL 23/36] block: Add bdrv_recurse_can_replace() Kevin Wolf
2020-02-18 14:07 ` [PULL 24/36] blkverify: Implement .bdrv_recurse_can_replace() Kevin Wolf
2020-02-18 14:07 ` [PULL 25/36] quorum: " Kevin Wolf
2020-02-18 14:07 ` [PULL 26/36] block: Use bdrv_recurse_can_replace() Kevin Wolf
2020-02-18 14:07 ` [PULL 27/36] block: Remove bdrv_recurse_is_first_non_filter() Kevin Wolf
2020-02-18 14:07 ` [PULL 28/36] mirror: Double-check immediately before replacing Kevin Wolf
2020-02-18 14:07 ` [PULL 29/36] quorum: Stop marking it as a filter Kevin Wolf
2020-02-18 14:07 ` [PULL 30/36] iotests: Use complete_and_wait() in 155 Kevin Wolf
2020-02-18 14:07 ` Kevin Wolf [this message]
2020-02-18 14:07 ` [PULL 32/36] iotests/041: Drop superfluous shutdowns Kevin Wolf
2020-02-18 14:07 ` [PULL 33/36] iotests: Resolve TODOs in 041 Kevin Wolf
2020-02-18 14:07 ` [PULL 34/36] iotests: Use self.image_len in TestRepairQuorum Kevin Wolf
2020-02-18 14:07 ` [PULL 35/36] iotests: Add tests for invalid Quorum @replaces Kevin Wolf
2020-02-18 14:07 ` [PULL 36/36] iotests: Check that @replaces can replace filters Kevin Wolf
2020-02-20 14:04 ` [PULL 00/36] Block layer patches Peter Maydell
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=20200218140722.23876-32-kwolf@redhat.com \
--to=kwolf@redhat.com \
--cc=peter.maydell@linaro.org \
--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).