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

tests: prefix internal functions with underscore

Browse Source 
Preparation for API for external tests.

QubesOS/qubes-issues#1800
This commit is contained in:
Marek Marczykowski-Górecki 2016-03-03 00:15:09 +01:00
parent 7ca89688bd
commit 29c602c9ff
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
tests/__init__.py
View File

@ -245,7 +245,7 @@ class SystemTestsMixin(object):
self.conn = libvirt.open(qubes.qubes.defaults['libvirt_uri']) self.conn = libvirt.open(qubes.qubes.defaults['libvirt_uri'])
self.remove_test_vms(self.qc, self.conn) self._remove_test_vms(self.qc, self.conn)
def tearDown(self): def tearDown(self):
super(SystemTestsMixin, self).tearDown() super(SystemTestsMixin, self).tearDown()
@ -257,12 +257,12 @@ class SystemTestsMixin(object):
except qubes.qubes.QubesException: except qubes.qubes.QubesException:
pass pass
self.kill_test_vms(self.qc) self._kill_test_vms(self.qc)
self.qc.lock_db_for_writing() self.qc.lock_db_for_writing()
self.qc.load() self.qc.load()
self.remove_test_vms(self.qc, self.conn) self._remove_test_vms(self.qc, self.conn)
self.qc.save() self.qc.save()
self.qc.unlock_db() self.qc.unlock_db()
@ -281,12 +281,12 @@ class SystemTestsMixin(object):
conn = libvirt.open(qubes.qubes.defaults['libvirt_uri']) conn = libvirt.open(qubes.qubes.defaults['libvirt_uri'])
cls.kill_test_vms(qc, prefix=CLSVMPREFIX) cls._kill_test_vms(qc, prefix=CLSVMPREFIX)
qc.lock_db_for_writing() qc.lock_db_for_writing()
qc.load() qc.load()
cls.remove_test_vms(qc, conn, prefix=CLSVMPREFIX) cls._remove_test_vms(qc, conn, prefix=CLSVMPREFIX)
qc.save() qc.save()
qc.unlock_db() qc.unlock_db()
@ -308,7 +308,7 @@ class SystemTestsMixin(object):
self.qc.load() self.qc.load()
@staticmethod @staticmethod
def kill_test_vms(qc, prefix=VMPREFIX): def _kill_test_vms(qc, prefix=VMPREFIX):
# do not keep write lock while killing VMs, because that may cause a # do not keep write lock while killing VMs, because that may cause a
# deadlock with disk hotplug scripts (namely qvm-template-commit # deadlock with disk hotplug scripts (namely qvm-template-commit
# called when shutting down TemplateVm) # called when shutting down TemplateVm)
@ -383,7 +383,7 @@ class SystemTestsMixin(object):
self.save_and_reload_db() self.save_and_reload_db()
@classmethod @classmethod
def remove_test_vms(cls, qc, conn, prefix=VMPREFIX): def _remove_test_vms(cls, qc, conn, prefix=VMPREFIX):
"""Aggresively remove any domain that has name in testing namespace. """Aggresively remove any domain that has name in testing namespace.
.. warning:: .. warning::