iotests/migration-permissions: use assertRaises() for qemu_io() negative test
Modify this test to use assertRaises for its negative testing of qemu_io. If the exception raised does not match the one we tell it to expect, we get *that* exception unhandled. If we get no exception, we get a unittest assertion failure and the provided emsg printed to screen. If we get the CalledProcessError exception but the output is not what we expect, we re-raise the original CalledProcessError. Tidy. (Note: Yes, you can reference "with" objects after that block ends; it just means that ctx.__exit__(...) will have been called on it. It does not *actually* go out of scope. unittests expects you to want to inspect the Exception object, so they leave it defined post-exit.) Signed-off-by: John Snow <jsnow@redhat.com> Reviewed-by: Eric Blake <eblake@redhat.com> Tested-by: Eric Blake <eblake@redhat.com> Reviewed-by: Hanna Reitz <hreitz@redhat.com> Message-Id: <20220418211504.943969-9-jsnow@redhat.com> Signed-off-by: Hanna Reitz <hreitz@redhat.com>
This commit is contained in:
parent
6dede6a493
commit
7acb2ddfec
@ -18,6 +18,8 @@
|
||||
#
|
||||
|
||||
import os
|
||||
from subprocess import CalledProcessError
|
||||
|
||||
import iotests
|
||||
from iotests import imgfmt, qemu_img_create, qemu_io
|
||||
|
||||
@ -69,13 +71,12 @@ class TestMigrationPermissions(iotests.QMPTestCase):
|
||||
def test_post_migration_permissions(self):
|
||||
# Try to access the image R/W, which should fail because virtio-blk
|
||||
# has not been configured with share-rw=on
|
||||
log = qemu_io('-f', imgfmt, '-c', 'quit', test_img, check=False).stdout
|
||||
if not log.strip():
|
||||
print('ERROR (pre-migration): qemu-io should not be able to '
|
||||
'access this image, but it reported no error')
|
||||
else:
|
||||
# This is the expected output
|
||||
assert 'Is another process using the image' in log
|
||||
emsg = ('ERROR (pre-migration): qemu-io should not be able to '
|
||||
'access this image, but it reported no error')
|
||||
with self.assertRaises(CalledProcessError, msg=emsg) as ctx:
|
||||
qemu_io('-f', imgfmt, '-c', 'quit', test_img)
|
||||
if 'Is another process using the image' not in ctx.exception.stdout:
|
||||
raise ctx.exception
|
||||
|
||||
# Now migrate the VM
|
||||
self.vm_s.qmp('migrate', uri=f'unix:{mig_sock}')
|
||||
@ -84,13 +85,12 @@ class TestMigrationPermissions(iotests.QMPTestCase):
|
||||
|
||||
# Try the same qemu-io access again, verifying that the WRITE
|
||||
# permission remains unshared
|
||||
log = qemu_io('-f', imgfmt, '-c', 'quit', test_img, check=False).stdout
|
||||
if not log.strip():
|
||||
print('ERROR (post-migration): qemu-io should not be able to '
|
||||
'access this image, but it reported no error')
|
||||
else:
|
||||
# This is the expected output
|
||||
assert 'Is another process using the image' in log
|
||||
emsg = ('ERROR (post-migration): qemu-io should not be able to '
|
||||
'access this image, but it reported no error')
|
||||
with self.assertRaises(CalledProcessError, msg=emsg) as ctx:
|
||||
qemu_io('-f', imgfmt, '-c', 'quit', test_img)
|
||||
if 'Is another process using the image' not in ctx.exception.stdout:
|
||||
raise ctx.exception
|
||||
|
||||
|
||||
if __name__ == '__main__':
|
||||
|
Loading…
Reference in New Issue
Block a user