shaba/virt-manager
1
0
Fork 0
mirror of https://github.com/virt-manager/virt-manager.git synced 2025-01-24 02:04:13 +03:00
Code Issues Projects Releases Wiki Activity

cloner: Remove redundant setup() method

Browse Source 
The functional callers use the individual setup methods, let's drop the
helper function and adjust the test suite
This commit is contained in:
Cole Robinson 2017-07-20 17:18:14 -04:00
parent 9863a963fe
commit d3074141c8
2 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tests/clonetest.py
View File

@ -75,7 +75,8 @@ class TestClone(unittest.TestCase):
clone_disks_file=clone_disks_file)
self._clone_define(filebase)
else:
cloneobj.setup()
cloneobj.setup_original()
cloneobj.setup_clone()
def _default_clone_values(self, cloneobj, disks=None):
"""Sets default values for the cloned VM."""
@ -96,7 +97,8 @@ class TestClone(unittest.TestCase):
"""Helps compare output from passed clone instance with an xml file"""
outfile = os.path.join(clonexml_dir, outbase + "-out.xml")
cloneobj.setup()
cloneobj.setup_original()
cloneobj.setup_clone()
utils.diff_compare(cloneobj.clone_xml, outfile)
if clone_disks_file:

8
virtinst/cloner.py
View File

@ -459,14 +459,6 @@ class Cloner(object):
self._clone_xml = self._guest.get_xml_config()
logging.debug("Clone guest xml is\n%s", self._clone_xml)
def setup(self):
"""
Helper function that wraps setup_original and setup_clone, with
additional debug logging.
"""
self.setup_original()
self.setup_clone()
def start_duplicate(self, meter=None):
"""
Actually perform the duplication: cloning disks if needed and defining