Qubes/core-admin
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

tests: few more FD leak fixes

Browse Source 
QubesOS/qubes-issues#1697
This commit is contained in:
Marek Marczykowski-Górecki 2016-02-10 17:14:47 +01:00 committed by Wojtek Porczyk
parent 47e346efbf
commit 0a45164be7
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
qubes/tests/__init__.py
View File

@ -378,7 +378,15 @@ class SystemTestsMixin(object):
def tearDown(self): def tearDown(self):
super(SystemTestsMixin, self).tearDown() super(SystemTestsMixin, self).tearDown()
self.remove_test_vms() self.remove_test_vms()
# remove all references to VM objects, to release resources - most
# importantly file descriptors; this object will live
# during the whole test run, but all the file descriptors would be
# depleted earlier
del self.app
del self.host_app
for attr in dir(self):
if isinstance(getattr(self, attr), qubes.vm.BaseVM):
delattr(self, attr)
@staticmethod @staticmethod
def make_vm_name(name): def make_vm_name(name):
@ -475,6 +483,7 @@ class SystemTestsMixin(object):
for dom in conn.listAllDomains(): for dom in conn.listAllDomains():
if dom.name().startswith(VMPREFIX): if dom.name().startswith(VMPREFIX):
self._remove_vm_libvirt(dom) self._remove_vm_libvirt(dom)
conn.close()
# finally remove anything that is left on disk # finally remove anything that is left on disk
vmnames = set() vmnames = set()