Skip to content

Commit

Permalink
plugins.virt: Remove the hack for not-modifying-multiplex
Browse files Browse the repository at this point in the history
"avocado multiplex" was fixed and there is no need for the hack which
disabled the multiplex-tree injection when not running test.

Signed-off-by: Lukáš Doktor <[email protected]>
  • Loading branch information
ldoktor committed Jun 15, 2015
1 parent af1351d commit 8e73a28
Showing 1 changed file with 1 addition and 5 deletions.
6 changes: 1 addition & 5 deletions avocado/core/plugins/virt.py
Original file line number Diff line number Diff line change
Expand Up @@ -98,12 +98,8 @@ def __add_default_values(self, app_args):
def set_value(path, key, arg=None, value=None):
if arg:
value = getattr(app_args, arg, value)
root.get_node(path, True).value[key] = value
if value:
root.get_node(path, True).value[key] = value
root.get_node(path, True).value[key] = value

if not hasattr(app_args, 'qemu_bin'): # Dummy run (avocado plugins)
return
root = app_args.default_multiplex_tree
set_value('/plugins/virt/qemu/paths', 'qemu_bin', arg='qemu_bin')
set_value('/plugins/virt/qemu/paths', 'qemu_dst_bin', arg='qemu_dst_bin')
Expand Down

0 comments on commit 8e73a28

Please sign in to comment.