From: John Snow <jsnow@redhat.com>
To: qemu-devel@nongnu.org
Cc: Kevin Wolf <kwolf@redhat.com>,
Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>,
Eduardo Habkost <ehabkost@redhat.com>,
qemu-block@nongnu.org, Markus Armbruster <armbru@redhat.com>,
Hanna Reitz <hreitz@redhat.com>, Cleber Rosa <crosa@redhat.com>,
John Snow <jsnow@redhat.com>
Subject: [PATCH v3 02/16] iotests/mirror-top-perms: Adjust imports
Date: Thu, 16 Sep 2021 00:09:41 -0400 [thread overview]
Message-ID: <20210916040955.628560-3-jsnow@redhat.com> (raw)
In-Reply-To: <20210916040955.628560-1-jsnow@redhat.com>
We need to import things from the qemu namespace; importing the
namespace alone doesn't bring the submodules with it -- unless someone
else (like iotests.py) imports them too.
Adjust the imports.
Signed-off-by: John Snow <jsnow@redhat.com>
---
tests/qemu-iotests/tests/mirror-top-perms | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/tests/qemu-iotests/tests/mirror-top-perms b/tests/qemu-iotests/tests/mirror-top-perms
index 2fc8dd66e0..de18182590 100755
--- a/tests/qemu-iotests/tests/mirror-top-perms
+++ b/tests/qemu-iotests/tests/mirror-top-perms
@@ -25,7 +25,8 @@ from iotests import qemu_img
# Import qemu after iotests.py has amended sys.path
# pylint: disable=wrong-import-order
-import qemu
+from qemu import qmp
+from qemu.machine import machine
image_size = 1 * 1024 * 1024
@@ -47,7 +48,7 @@ class TestMirrorTopPerms(iotests.QMPTestCase):
def tearDown(self):
try:
self.vm.shutdown()
- except qemu.machine.machine.AbnormalShutdown:
+ except machine.AbnormalShutdown:
pass
if self.vm_b is not None:
@@ -102,7 +103,7 @@ class TestMirrorTopPerms(iotests.QMPTestCase):
self.vm_b.launch()
print('ERROR: VM B launched successfully, this should not have '
'happened')
- except qemu.qmp.QMPConnectError:
+ except qmp.QMPConnectError:
assert 'Is another process using the image' in self.vm_b.get_log()
result = self.vm.qmp('block-job-cancel',
--
2.31.1
next prev parent reply other threads:[~2021-09-16 4:15 UTC|newest]
Thread overview: 51+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-09-16 4:09 [PATCH v3 00/16] python/iotests: Run iotest linters during Python CI John Snow
2021-09-16 4:09 ` [PATCH v3 01/16] python: Update for pylint 2.10 John Snow
2021-09-16 13:28 ` Alex Bennée
2021-09-16 14:34 ` John Snow
2021-09-16 4:09 ` John Snow [this message]
2021-09-16 4:27 ` [PATCH v3 02/16] iotests/mirror-top-perms: Adjust imports Philippe Mathieu-Daudé
2021-09-16 14:27 ` John Snow
2021-09-16 15:05 ` Philippe Mathieu-Daudé
2021-09-17 8:35 ` Hanna Reitz
2021-09-16 4:09 ` [PATCH v3 03/16] iotests/migrate-bitmaps-postcopy-test: declare instance variables John Snow
2021-09-17 8:37 ` Hanna Reitz
2021-09-22 19:15 ` John Snow
2021-09-16 4:09 ` [PATCH v3 04/16] iotests/migrate-bitmaps-test: delint John Snow
2021-09-16 4:28 ` Philippe Mathieu-Daudé
2021-09-17 8:59 ` Hanna Reitz
2021-09-16 4:09 ` [PATCH v3 05/16] iotests/297: modify is_python_file to work from any CWD John Snow
2021-09-17 9:08 ` Hanna Reitz
2021-09-16 4:09 ` [PATCH v3 06/16] iotests/297: Add get_files() function John Snow
2021-09-17 9:24 ` Hanna Reitz
2021-09-22 19:25 ` John Snow
2021-09-16 4:09 ` [PATCH v3 07/16] iotests/297: Don't rely on distro-specific linter binaries John Snow
2021-09-17 9:43 ` Hanna Reitz
2021-09-22 19:53 ` John Snow
2021-10-04 8:16 ` Hanna Reitz
2021-10-04 18:59 ` John Snow
2021-09-16 4:09 ` [PATCH v3 08/16] iotests/297: Create main() function John Snow
2021-09-16 4:31 ` Philippe Mathieu-Daudé
2021-09-17 9:58 ` Hanna Reitz
2021-09-16 4:09 ` [PATCH v3 09/16] iotests/297: Separate environment setup from test execution John Snow
2021-09-17 10:05 ` Hanna Reitz
2021-09-16 4:09 ` [PATCH v3 10/16] iotests/297: Add 'directory' argument to run_linters John Snow
2021-09-17 10:10 ` Hanna Reitz
2021-09-16 4:09 ` [PATCH v3 11/16] iotests/297: return error code from run_linters() John Snow
2021-09-17 11:00 ` Hanna Reitz
2021-09-22 20:18 ` John Snow
2021-10-04 7:45 ` Hanna Reitz
2021-10-04 19:26 ` John Snow
2021-09-16 4:09 ` [PATCH v3 12/16] iotests/297: split linters.py off from 297 John Snow
2021-09-16 4:09 ` [PATCH v3 13/16] iotests/linters: Add entry point for Python CI linters John Snow
2021-09-16 4:52 ` Philippe Mathieu-Daudé
2021-09-16 4:09 ` [PATCH v3 14/16] iotests/linters: Add workaround for mypy bug #9852 John Snow
2021-09-17 11:16 ` Hanna Reitz
2021-09-22 20:37 ` John Snow
2021-09-22 20:38 ` John Snow
2021-10-04 8:35 ` Hanna Reitz
2021-10-04 8:31 ` Hanna Reitz
2021-09-16 4:09 ` [PATCH v3 15/16] python: Add iotest linters to test suite John Snow
2021-09-16 4:09 ` [PATCH v3 16/16] iotests/linters: check mypy files all at once John Snow
2021-09-17 11:23 ` Hanna Reitz
2021-09-22 20:41 ` John Snow
2021-09-17 5:46 ` [PATCH v3 00/16] python/iotests: Run iotest linters during Python CI John Snow
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=20210916040955.628560-3-jsnow@redhat.com \
--to=jsnow@redhat.com \
--cc=armbru@redhat.com \
--cc=crosa@redhat.com \
--cc=ehabkost@redhat.com \
--cc=hreitz@redhat.com \
--cc=kwolf@redhat.com \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=vsementsov@virtuozzo.com \
/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).