diff options
| author | Kevin Wolf <kwolf@redhat.com> | 2020-10-27 17:38:04 +0100 |
|---|---|---|
| committer | Kevin Wolf <kwolf@redhat.com> | 2020-11-03 16:24:56 +0100 |
| commit | 503c2b31b675c9fba2ff9711a79e55585304895a (patch) | |
| tree | b7eb794860ddb96eab5f823ddf999d3085e6a96e /tests/qemu-iotests/iotests.py | |
| parent | 6aec830e77a3f80952b41e421dc23c0041c1e399 (diff) | |
| download | focaccia-qemu-503c2b31b675c9fba2ff9711a79e55585304895a.tar.gz focaccia-qemu-503c2b31b675c9fba2ff9711a79e55585304895a.zip | |
iotests.py: Fix type check errors in wait_migration()
Commit 1847a4a8c20 clarified that event_wait() can return None (though only with timeout=0) and commit f12a282ff47 annotated it as returning Optional[QMPMessage]. Type checks in wait_migration() fail because of the unexpected optional return type: iotests.py:750: error: Value of type variable "Msg" of "log" cannot be "Optional[Dict[str, Any]]" iotests.py:751: error: Value of type "Optional[Dict[str, Any]]" is not indexable iotests.py:754: error: Value of type "Optional[Dict[str, Any]]" is not indexable Fortunately, the non-zero default timeout is used in the event_wait() call, so we can make mypy happy by just asserting this. Signed-off-by: Kevin Wolf <kwolf@redhat.com> Message-Id: <20201027163806.290960-2-kwolf@redhat.com> Reviewed-by: John Snow <jsnow@redhat.com> Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Diffstat (limited to 'tests/qemu-iotests/iotests.py')
| -rw-r--r-- | tests/qemu-iotests/iotests.py | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/tests/qemu-iotests/iotests.py b/tests/qemu-iotests/iotests.py index 63d2ace93c..28388a0fbc 100644 --- a/tests/qemu-iotests/iotests.py +++ b/tests/qemu-iotests/iotests.py @@ -747,6 +747,10 @@ class VM(qtest.QEMUQtestMachine): def wait_migration(self, expect_runstate: Optional[str]) -> bool: while True: event = self.event_wait('MIGRATION') + # We use the default timeout, and with a timeout, event_wait() + # never returns None + assert event + log(event, filters=[filter_qmp_event]) if event['data']['status'] in ('completed', 'failed'): break |