Merge branch 'mux-plugin2-bugfixes'

avocado/core/job.py

@@ -520,15 +520,6 @@ class Job(object):
         """
         Handled main job method. Runs a list of test URLs to its completion.
 
-        Note that the behavior is as follows:
-
-        * If urls is provided alone, just make a simple list with no specific
-          params (all tests use default params).
-        * If urls and multiplex_files are provided, multiplex provides params
-          and variants to all tests it can.
-        * If multiplex_files are provided alone, just use the matrix produced
-          by the file
-
         The test runner figures out which tests need to be run on an empty urls
         list by assuming the first component of the shortname is the test url.
 

avocado/core/multiplexer.py

@@ -389,11 +389,12 @@ class Mux(object):
         filter_only = getattr(args, 'filter_only', None)
         filter_out = getattr(args, 'filter_out', None)
         if mux_files:
-            mux_tree = yaml2tree(mux_files, filter_only, filter_out)
+            mux_tree = yaml2tree(mux_files)
         else:   # no variants
             mux_tree = tree.TreeNode()
         if getattr(args, 'default_avocado_params', None):
             mux_tree.merge(args.default_avocado_params)
+        mux_tree = tree.apply_filters(mux_tree, filter_only, filter_out)
         self.variants = MuxTree(mux_tree)
         self._mux_path = getattr(args, 'mux_path', None)
         if self._mux_path is None:

avocado/plugins/run.py

@@ -132,25 +132,23 @@ class Run(CLICmd):
 
         loader.add_loader_options(parser)
 
+        mux = parser.add_argument_group('test parameters')
         if multiplexer.MULTIPLEX_CAPABLE:
-            mux = parser.add_argument_group('multiplexer use on test execution')
-            mux.add_argument('-m', '--multiplex', nargs='*', dest='multiplex_files',
+            mux.add_argument('-m', '--multiplex', nargs='*',
+                             dest='multiplex_files',
                              default=None, metavar='FILE',
-                             help='Location of one or more Avocado multiplex (.yaml) '
-                             'FILE(s) (order dependent)')
-            mux.add_argument('--multiplex-files', nargs='*',
-                             default=None, metavar='FILE',
-                             help='DEPRECATED: please use --multiplex instead')
-            mux.add_argument('--filter-only', nargs='*', default=[],
-                             help='Filter only path(s) from multiplexing')
-            mux.add_argument('--filter-out', nargs='*', default=[],
-                             help='Filter out path(s) from multiplexing')
-            mux.add_argument('--mux-path', nargs='*', default=None,
-                             help="List of paths used to determine path "
-                             "priority when querying for parameters")
-            mux.add_argument('--mux-inject', default=[], nargs='*',
-                             help="Inject [path:]key:node values into the "
-                             "final multiplex tree.")
+                             help='Location of one or more Avocado multiplex '
+                             '(.yaml) FILE(s) (order dependent)')
+        mux.add_argument('--filter-only', nargs='*', default=[],
+                         help='Filter only path(s) from multiplexing')
+        mux.add_argument('--filter-out', nargs='*', default=[],
+                         help='Filter out path(s) from multiplexing')
+        mux.add_argument('--mux-path', nargs='*', default=None,
+                         help="List of paths used to determine path "
+                         "priority when querying for parameters")
+        mux.add_argument('--mux-inject', default=[], nargs='*',
+                         help="Inject [path:]key:node values into the "
+                         "final multiplex tree.")
 
     def _activate(self, args):
         # Extend default multiplex tree of --mux_inject values