Merge branch 'clebergnu-move_mux_to_plugin'

Signed-off-by: NAmador Pahim <apahim@redhat.com>

optional_plugins/loader_yaml/avocado_loader_yaml/__init__.py

@@ -18,10 +18,10 @@ import copy
 from six import iteritems
 
 from avocado.core import loader
-from avocado.core import mux
 from avocado.core import varianter
 from avocado.core.plugin_interfaces import CLI
 from avocado_varianter_yaml_to_mux import create_from_yaml
+from avocado_varianter_yaml_to_mux import mux
 
 
 class YamlTestsuiteLoader(loader.TestLoader):

optional_plugins/varianter_yaml_to_mux/avocado_varianter_yaml_to_mux/__init__.py

@@ -22,10 +22,12 @@ import sys
 
 from six import iteritems
 
-from avocado.core import tree, exit_codes, mux, varianter
+from avocado.core import tree, exit_codes, varianter
 from avocado.core.output import LOG_UI
 from avocado.core.plugin_interfaces import CLI, Varianter
 
+from . import mux
+
 
 try:
     import yaml

avocado/core/mux.py → optional_plugins/varianter_yaml_to_mux/avocado_varianter_yaml_to_mux/mux.py

@@ -27,8 +27,8 @@ import re
 
 from six.moves import xrange as range
 
-from . import tree
-from . import varianter
+from avocado.core import tree
+from avocado.core import varianter
 
 
 #

selftests/unit/test_mux.py

@@ -8,7 +8,8 @@ import yaml
 from six import iteritems
 
 import avocado_varianter_yaml_to_mux as yaml_to_mux
-from avocado.core import mux, tree, varianter
+from avocado_varianter_yaml_to_mux import mux
+from avocado.core import tree, varianter
 
 BASEDIR = os.path.join(os.path.dirname(os.path.abspath(__file__)), '..', '..')
 BASEDIR = os.path.abspath(BASEDIR)