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

tests: move make_vm_name to QubesTestCase

Browse Source 
This function is often useful also in unit tests, not only integration
tests.
This commit is contained in:
Marek Marczykowski-Górecki 2016-02-11 05:42:08 +01:00 committed by Wojtek Porczyk
parent 5375dce90d
commit 14f31134c0
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
qubes/tests/__init__.py
View File

@ -348,6 +348,13 @@ class QubesTestCase(unittest.TestCase):
except AssertionError as e: except AssertionError as e:
self.fail(str(e)) self.fail(str(e))
@staticmethod
def make_vm_name(name, class_teardown=False):
if class_teardown:
return CLSVMPREFIX + name
else:
return VMPREFIX + name
class SystemTestsMixin(object): class SystemTestsMixin(object):
""" """
@ -431,14 +438,6 @@ class SystemTestsMixin(object):
return return
cls.remove_test_vms(xmlpath=CLASS_XMLPATH, prefix=CLSVMPREFIX) cls.remove_test_vms(xmlpath=CLASS_XMLPATH, prefix=CLSVMPREFIX)
@staticmethod
def make_vm_name(name, class_teardown=False):
if class_teardown:
return CLSVMPREFIX + name
else:
return VMPREFIX + name
@classmethod @classmethod
def _remove_vm_qubes(cls, vm): def _remove_vm_qubes(cls, vm):
vmname = vm.name vmname = vm.name