[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 3/3] qemu-iotests: use context managers for resource
From: |
Stefan Hajnoczi |
Subject: |
[Qemu-devel] [PATCH 3/3] qemu-iotests: use context managers for resource cleanup in 194 |
Date: |
Thu, 24 Aug 2017 08:22:02 +0100 |
Switch from atexit.register() to a more elegant idiom of declaring
resources in a with statement:
with FilePath('monitor.sock') as monitor_path,
VM() as vm:
...
The files and VMs will be automatically cleaned up whether the test
passes or fails.
Signed-off-by: Stefan Hajnoczi <address@hidden>
---
tests/qemu-iotests/194 | 83 +++++++++++++++++++++++++-------------------------
1 file changed, 41 insertions(+), 42 deletions(-)
diff --git a/tests/qemu-iotests/194 b/tests/qemu-iotests/194
index 8028111e21..06aea661d4 100755
--- a/tests/qemu-iotests/194
+++ b/tests/qemu-iotests/194
@@ -19,55 +19,54 @@
#
# Non-shared storage migration test using NBD server and drive-mirror
-import os
-import atexit
import iotests
iotests.verify_platform(['linux'])
-img_size = '1G'
-source_img_path = os.path.join(iotests.test_dir, 'source.img')
-dest_img_path = os.path.join(iotests.test_dir, 'dest.img')
-iotests.qemu_img_pipe('create', '-f', iotests.imgfmt, source_img_path,
img_size)
-iotests.qemu_img_pipe('create', '-f', iotests.imgfmt, dest_img_path, img_size)
+with iotests.FilePath('source.img') as source_img_path, \
+ iotests.FilePath('dest.img') as dest_img_path, \
+ iotests.FilePath('migration.sock') as migration_sock_path, \
+ iotests.FilePath('nbd.sock') as nbd_sock_path, \
+ iotests.VM('source') as source_vm, \
+ iotests.VM('dest') as dest_vm:
-iotests.log('Launching VMs...')
-migration_sock_path = os.path.join(iotests.test_dir, 'migration.sock')
-nbd_sock_path = os.path.join(iotests.test_dir, 'nbd.sock')
-source_vm = iotests.VM('source').add_drive(source_img_path)
-dest_vm = (iotests.VM('dest').add_drive(dest_img_path)
-
.add_incoming('unix:{0}'.format(migration_sock_path)))
-source_vm.launch()
-atexit.register(source_vm.shutdown)
-dest_vm.launch()
-atexit.register(dest_vm.shutdown)
+ img_size = '1G'
+ iotests.qemu_img_pipe('create', '-f', iotests.imgfmt, source_img_path,
img_size)
+ iotests.qemu_img_pipe('create', '-f', iotests.imgfmt, dest_img_path,
img_size)
-iotests.log('Launching NBD server on destination...')
-iotests.log(dest_vm.qmp('nbd-server-start', addr={'type': 'unix', 'data':
{'path': nbd_sock_path}}))
-iotests.log(dest_vm.qmp('nbd-server-add', device='drive0', writable=True))
+ iotests.log('Launching VMs...')
+ (source_vm.add_drive(source_img_path)
+ .launch())
+ (dest_vm.add_drive(dest_img_path)
+ .add_incoming('unix:{0}'.format(migration_sock_path))
+ .launch())
-iotests.log('Starting drive-mirror on source...')
-iotests.log(source_vm.qmp(
- 'drive-mirror',
- device='drive0',
- target='nbd+unix:///drive0?socket={0}'.format(nbd_sock_path),
- sync='full',
- format='raw', # always raw, the server handles the format
- mode='existing'))
+ iotests.log('Launching NBD server on destination...')
+ iotests.log(dest_vm.qmp('nbd-server-start', addr={'type': 'unix', 'data':
{'path': nbd_sock_path}}))
+ iotests.log(dest_vm.qmp('nbd-server-add', device='drive0', writable=True))
-iotests.log('Waiting for drive-mirror to complete...')
-iotests.log(source_vm.event_wait('BLOCK_JOB_READY'),
- filters=[iotests.filter_qmp_event])
+ iotests.log('Starting drive-mirror on source...')
+ iotests.log(source_vm.qmp(
+ 'drive-mirror',
+ device='drive0',
+ target='nbd+unix:///drive0?socket={0}'.format(nbd_sock_path),
+ sync='full',
+ format='raw', # always raw, the server handles the format
+ mode='existing'))
-iotests.log('Starting migration...')
-source_vm.qmp('migrate-set-capabilities',
- capabilities=[{'capability': 'events', 'state': True}])
-dest_vm.qmp('migrate-set-capabilities',
- capabilities=[{'capability': 'events', 'state': True}])
-iotests.log(source_vm.qmp('migrate',
uri='unix:{0}'.format(migration_sock_path)))
+ iotests.log('Waiting for drive-mirror to complete...')
+ iotests.log(source_vm.event_wait('BLOCK_JOB_READY'),
+ filters=[iotests.filter_qmp_event])
-while True:
- event = source_vm.event_wait('MIGRATION')
- iotests.log(event, filters=[iotests.filter_qmp_event])
- if event['data']['status'] in ('completed', 'failed'):
- break
+ iotests.log('Starting migration...')
+ source_vm.qmp('migrate-set-capabilities',
+ capabilities=[{'capability': 'events', 'state': True}])
+ dest_vm.qmp('migrate-set-capabilities',
+ capabilities=[{'capability': 'events', 'state': True}])
+ iotests.log(source_vm.qmp('migrate',
uri='unix:{0}'.format(migration_sock_path)))
+
+ while True:
+ event = source_vm.event_wait('MIGRATION')
+ iotests.log(event, filters=[iotests.filter_qmp_event])
+ if event['data']['status'] in ('completed', 'failed'):
+ break
--
2.13.5
- [Qemu-devel] [PATCH 0/3] iotests: clean up resources using context managers, Stefan Hajnoczi, 2017/08/24
- [Qemu-devel] [PATCH 2/3] iotests.py: add FilePath context manager, Stefan Hajnoczi, 2017/08/24
- [Qemu-devel] [PATCH 1/3] qemu.py: make VM() a context manager, Stefan Hajnoczi, 2017/08/24
- [Qemu-devel] [PATCH 3/3] qemu-iotests: use context managers for resource cleanup in 194,
Stefan Hajnoczi <=
- Re: [Qemu-devel] [PATCH 0/3] iotests: clean up resources using context managers, Fam Zheng, 2017/08/24
- Re: [Qemu-devel] [PATCH 0/3] iotests: clean up resources using context managers, Stefan Hajnoczi, 2017/08/24
- Re: [Qemu-devel] [PATCH 0/3] iotests: clean up resources using context managers, Fam Zheng, 2017/08/25
- Re: [Qemu-devel] [PATCH 0/3] iotests: clean up resources using context managers, Stefan Hajnoczi, 2017/08/25
- Re: [Qemu-devel] [PATCH 0/3] iotests: clean up resources using context managers, Fam Zheng, 2017/08/25
- Re: [Qemu-devel] [PATCH 0/3] iotests: clean up resources using context managers, Stefan Hajnoczi, 2017/08/30
- Re: [Qemu-devel] [PATCH 0/3] iotests: clean up resources using context managers, Fam Zheng, 2017/08/30
- Re: [Qemu-devel] [PATCH 0/3] iotests: clean up resources using context managers, Markus Armbruster, 2017/08/28
Re: [Qemu-devel] [PATCH 0/3] iotests: clean up resources using context managers, Stefan Hajnoczi, 2017/08/31