Fix tests

(cherry picked from commit 2ba6eac113)
This commit is contained in:
grossmj
2020-08-13 17:10:31 +09:30
committed by Bernhard Ehlers
parent 9acb2ceda1
commit c684c554bf
4 changed files with 17 additions and 17 deletions

View File

@ -132,17 +132,17 @@ class QemuVM(BaseNode):
# config disk
self.config_disk_name = self.manager.config_disk
self.config_disk_image = ""
if not shutil.which("mcopy"):
log.warning("Config disk: 'mtools' are not installed.")
self.config_disk_name = ""
else:
try:
self.config_disk_image = self.manager.get_abs_image_path(
self.config_disk_name)
except (NodeError, ImageMissingError) as e:
log.warning("Config disk: image '{}' missing"
.format(self.config_disk_name))
if self.config_disk_name:
if not shutil.which("mcopy"):
log.warning("Config disk: 'mtools' are not installed.")
self.config_disk_name = ""
else:
try:
self.config_disk_image = self.manager.get_abs_image_path(self.config_disk_name)
except (NodeError, ImageMissingError) as e:
log.warning("Config disk: image '{}' missing"
.format(self.config_disk_name))
self.config_disk_name = ""
log.info('QEMU VM "{name}" [{id}] has been created'.format(name=self._name, id=self._id))