mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

iotests/migration-permissions: use assertRaises() for qemu_io() negative test

Browse Source 
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:
John Snow 2022-04-18 17:15:00 -04:00 committed by Hanna Reitz
parent 6dede6a493
commit 7acb2ddfec
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
tests/qemu-iotests/tests/migration-permissions
View File

@ -18,6 +18,8 @@
# #
import os import os
from subprocess import CalledProcessError
import iotests import iotests
from iotests import imgfmt, qemu_img_create, qemu_io from iotests import imgfmt, qemu_img_create, qemu_io
@ -69,13 +71,12 @@ class TestMigrationPermissions(iotests.QMPTestCase):
def test_post_migration_permissions(self): def test_post_migration_permissions(self):
# Try to access the image R/W, which should fail because virtio-blk # Try to access the image R/W, which should fail because virtio-blk
# has not been configured with share-rw=on # has not been configured with share-rw=on
log = qemu_io('-f', imgfmt, '-c', 'quit', test_img, check=False).stdout emsg = ('ERROR (pre-migration): qemu-io should not be able to '
if not log.strip(): 'access this image, but it reported no error')
print('ERROR (pre-migration): qemu-io should not be able to ' with self.assertRaises(CalledProcessError, msg=emsg) as ctx:
'access this image, but it reported no error') qemu_io('-f', imgfmt, '-c', 'quit', test_img)
else: if 'Is another process using the image' not in ctx.exception.stdout:
# This is the expected output raise ctx.exception
assert 'Is another process using the image' in log
# Now migrate the VM # Now migrate the VM
self.vm_s.qmp('migrate', uri=f'unix:{mig_sock}') 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 # Try the same qemu-io access again, verifying that the WRITE
# permission remains unshared # permission remains unshared
log = qemu_io('-f', imgfmt, '-c', 'quit', test_img, check=False).stdout emsg = ('ERROR (post-migration): qemu-io should not be able to '
if not log.strip(): 'access this image, but it reported no error')
print('ERROR (post-migration): qemu-io should not be able to ' with self.assertRaises(CalledProcessError, msg=emsg) as ctx:
'access this image, but it reported no error') qemu_io('-f', imgfmt, '-c', 'quit', test_img)
else: if 'Is another process using the image' not in ctx.exception.stdout:
# This is the expected output raise ctx.exception
assert 'Is another process using the image' in log
if __name__ == '__main__': if __name__ == '__main__':