[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 2/3] iotests.py: add FilePath context manager
From: |
Stefan Hajnoczi |
Subject: |
[Qemu-devel] [PATCH 2/3] iotests.py: add FilePath context manager |
Date: |
Thu, 24 Aug 2017 08:22:01 +0100 |
The scratch/ (TEST_DIR) directory is not automatically cleaned up after
test execution. It is the responsibility of tests to remove any files
they create.
A nice way of doing this is to declare files at the beginning of the
test and automatically remove them with a context manager:
with iotests.FilePath('test.img') as img_path:
qemu_img(...)
qemu_io(...)
# img_path is guaranteed to be deleted here
Signed-off-by: Stefan Hajnoczi <address@hidden>
---
tests/qemu-iotests/iotests.py | 26 ++++++++++++++++++++++++++
1 file changed, 26 insertions(+)
diff --git a/tests/qemu-iotests/iotests.py b/tests/qemu-iotests/iotests.py
index 7233983f3c..07fa1626a0 100644
--- a/tests/qemu-iotests/iotests.py
+++ b/tests/qemu-iotests/iotests.py
@@ -160,6 +160,32 @@ class Timeout:
def timeout(self, signum, frame):
raise Exception(self.errmsg)
+
+class FilePath(object):
+ '''An auto-generated filename that cleans itself up.
+
+ Use this context manager to generate filenames and ensure that the file
+ gets deleted::
+
+ with TestFilePath('test.img') as img_path:
+ qemu_img('create', img_path, '1G')
+ # migration_sock_path is automatically deleted
+ '''
+ def __init__(self, name):
+ filename = '{0}-{1}'.format(os.getpid(), name)
+ self.path = os.path.join(test_dir, filename)
+
+ def __enter__(self):
+ return self.path
+
+ def __exit__(self, exc_type, exc_val, exc_tb):
+ try:
+ os.remove(self.path)
+ except OSError:
+ pass
+ return False
+
+
class VM(qtest.QEMUQtestMachine):
'''A QEMU VM'''
--
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 <=
- [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, 2017/08/24
- 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