From 14f31134c091595cac5c8a6f97e190d3730b10f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= Date: Thu, 11 Feb 2016 05:42:08 +0100 Subject: [PATCH] tests: move make_vm_name to QubesTestCase This function is often useful also in unit tests, not only integration tests. --- qubes/tests/__init__.py | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/qubes/tests/__init__.py b/qubes/tests/__init__.py index 9f8ae25d..f36a91f3 100644 --- a/qubes/tests/__init__.py +++ b/qubes/tests/__init__.py @@ -348,6 +348,13 @@ class QubesTestCase(unittest.TestCase): except AssertionError as 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): """ @@ -431,14 +438,6 @@ class SystemTestsMixin(object): return 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 def _remove_vm_qubes(cls, vm): vmname = vm.name