Merging pull request 2500

Signed-off-by: NLukáš Doktor <ldoktor@redhat.com>

* https://github.com/avocado-framework/avocado:
  Remove deprecated multiplex options

man/avocado.rst

@@ -291,17 +291,6 @@ Options for subcommand `run` (`avocado run --help`)::
                             Inject [path:]key:node values into the final multiplex
                             tree.
 
-    yaml to mux options [deprecated]:
-      --multiplex [FILE [FILE ...]]
-                            DEPRECATED: Location of one or more Avocado multiplex
-                            (.yaml) FILE(s) (order dependent)
-      --filter-only [FILTER_ONLY [FILTER_ONLY ...]]
-                            DEPRECATED: Filter only path(s) from multiplexing (use
-                            --mux-filter-only instead)
-      --filter-out [FILTER_OUT [FILTER_OUT ...]]
-                            DEPRECATED: Filter out path(s) from multiplexing (use
-                            --mux-filter-out instead)
-
 Options for subcommand `config` (`avocado config --help`)::
 
     optional arguments:
@@ -447,17 +436,6 @@ Options for subcommand `multiplex` (`avocado multiplex --help`)::
                             Inject [path:]key:node values into the final multiplex
                             tree.
 
-    yaml to mux options [deprecated]:
-      --multiplex [FILE [FILE ...]]
-                            DEPRECATED: Location of one or more Avocado multiplex
-                            (.yaml) FILE(s) (order dependent)
-      --filter-only [FILTER_ONLY [FILTER_ONLY ...]]
-                            DEPRECATED: Filter only path(s) from multiplexing (use
-                            --mux-filter-only instead)
-      --filter-out [FILTER_OUT [FILTER_OUT ...]]
-                            DEPRECATED: Filter out path(s) from multiplexing (use
-                            --mux-filter-out instead)
-
 Options for subcommand `plugins` (`avocado plugins --help`)::
 
     optional arguments:

optional_plugins/varianter_yaml_to_mux/avocado_varianter_yaml_to_mux/__init__.py

@@ -369,19 +369,6 @@ class YamlToMuxCLI(CLI):
             agroup.add_argument('--mux-inject', default=[], nargs='*',
                                 help="Inject [path:]key:node values into the "
                                 "final multiplex tree.")
-            agroup = subparser.add_argument_group("yaml to mux options "
-                                                  "[deprecated]")
-            agroup.add_argument("--multiplex", nargs='*',
-                                default=None, metavar="FILE",
-                                help="DEPRECATED: Location of one or more "
-                                "Avocado multiplex (.yaml) FILE(s) (order "
-                                "dependent)")
-            agroup.add_argument("--filter-only", nargs='*', default=[],
-                                help="DEPRECATED: Filter only path(s) from "
-                                "multiplexing (use --mux-filter-only instead)")
-            agroup.add_argument("--filter-out", nargs='*', default=[],
-                                help="DEPRECATED: Filter out path(s) from "
-                                "multiplexing (use --mux-filter-out instead)")
 
     def run(self, args):
         """
@@ -398,33 +385,7 @@ class YamlToMux(mux.MuxPlugin, Varianter):
     name = 'yaml_to_mux'
     description = 'Multiplexer plugin to parse yaml files to params'
 
-    @staticmethod
-    def _log_deprecation_msg(deprecated, current):
-        """
-        Log a message into the avocado.LOG_UI warning log
-        """
-        msg = "The use of '%s' is deprecated, please use '%s' instead"
-        LOG_UI.warning(msg, deprecated, current)
-
     def initialize(self, args):
-        # Deprecated filters
-        only = getattr(args, "filter_only", None)
-        if only:
-            self._log_deprecation_msg("--filter-only", "--mux-filter-only")
-            mux_filter_only = getattr(args, "mux_filter_only")
-            if mux_filter_only:
-                args.mux_filter_only = mux_filter_only + only
-            else:
-                args.mux_filter_only = only
-        out = getattr(args, "filter_out", None)
-        if out:
-            self._log_deprecation_msg("--filter-out", "--mux-filter-out")
-            mux_filter_out = getattr(args, "mux_filter_out")
-            if mux_filter_out:
-                args.mux_filter_out = mux_filter_out + out
-            else:
-                args.mux_filter_out = out
-
         debug = getattr(args, "varianter_debug", False)
         if debug:
             data = mux.MuxTreeNodeDebug()
@@ -444,22 +405,6 @@ class YamlToMux(mux.MuxPlugin, Varianter):
                 else:
                     sys.exit(exit_codes.AVOCADO_FAIL)
 
-        # Deprecated --multiplex option
-        multiplex_files = getattr(args, "multiplex", None)
-        if multiplex_files:
-            self._log_deprecation_msg("--multiplex", "--mux-yaml")
-            try:
-                data.merge(create_from_yaml(multiplex_files, debug))
-                from_yaml = create_from_yaml(multiplex_files, debug)
-                args.avocado_variants.data_merge(from_yaml)
-            except IOError as details:
-                error_msg = "%s : %s" % (details.strerror, details.filename)
-                LOG_UI.error(error_msg)
-                if args.subcommand == 'run':
-                    sys.exit(exit_codes.AVOCADO_JOB_FAIL)
-                else:
-                    sys.exit(exit_codes.AVOCADO_FAIL)
-
         # Extend default multiplex tree of --mux-inject values
         for inject in getattr(args, "mux_inject", []):
             entry = inject.split(':', 3)

optional_plugins/varianter_yaml_to_mux/tests/test_multiplex.py

@@ -148,7 +148,7 @@ class MultiplexTests(unittest.TestCase):
             cmd_line = ('%s run --job-results-dir %s --sysinfo=off '
                         'examples/tests/env_variables.sh '
                         '-m examples/tests/env_variables.sh.data/env_variables.yaml '
-                        '--filter-only %s --show-job-log'
+                        '--mux-filter-only %s --show-job-log'
                         % (AVOCADO, self.tmpdir, variant))
             expected_rc = exit_codes.AVOCADO_ALL_OK
             result = self.run_and_check(cmd_line, expected_rc)