[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 03/17] iotests/mirror-top-perms: Adjust import paths
From: |
John Snow |
Subject: |
[PATCH v2 03/17] iotests/mirror-top-perms: Adjust import paths |
Date: |
Tue, 20 Jul 2021 13:33:22 -0400 |
Technically AbnormalShutdown isn't exported via
'qemu.machine.AbnormalShutdown', but instead from
'qemu.machine.machine.AbnormalShutdown'. Odd, I know, and it's on the
list to fix. For now, change the imports here.
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 451a0666f81..de181825901 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.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
- [PATCH v2 00/17] python/iotests: Run iotest linters during Python CI, John Snow, 2021/07/20
- [PATCH v2 01/17] iotests: use with-statement for open() calls, John Snow, 2021/07/20
- [PATCH v2 02/17] iotests: use subprocess.DEVNULL instead of open("/dev/null"), John Snow, 2021/07/20
- [PATCH v2 03/17] iotests/mirror-top-perms: Adjust import paths,
John Snow <=
- [PATCH v2 04/17] iotests/migrate-bitmaps-postcopy-test: declare instance variables, John Snow, 2021/07/20
- [PATCH v2 05/17] iotests/migrate-bitmaps-test: delint, John Snow, 2021/07/20
- [PATCH v2 06/17] iotests/297: modify is_python_file to work from any CWD, John Snow, 2021/07/20
- [PATCH v2 07/17] iotests/297: Add get_files() function, John Snow, 2021/07/20
- [PATCH v2 10/17] iotests/297: Create main() function, John Snow, 2021/07/20
- [PATCH v2 09/17] iotests/297: Don't rely on distro-specific linter binaries, John Snow, 2021/07/20
- [PATCH v2 08/17] iotests/297: Include sub-directories when finding tests to lint, John Snow, 2021/07/20
- [PATCH v2 12/17] iotests/297: Add 'directory' argument to run_linters, John Snow, 2021/07/20