DAOS-15234 test: Better integrate with avocado 92

requirements-ftest.txt

@@ -1,6 +1,6 @@
-avocado-framework==82
-avocado-framework-plugin-result-html==82
-avocado-framework-plugin-varianter-yaml-to-mux==82
+avocado-framework==92
+avocado-framework-plugin-result-html==92
+avocado-framework-plugin-varianter-yaml-to-mux==92
 clustershell
 paramiko
 distro

src/tests/ftest/util/avocado_utils.py

@@ -160,26 +160,6 @@ def get_directory(self, directory):
         logs_dir = self.get_logs_dir()
         return os.path.join(logs_dir, directory)
 
-    def get_list_command(self):
-        """Get the avocado list command for this version of avocado.
-
-        Returns:
-            list: avocado list command parts
-        """
-        if self.major >= 83:
-            return ["avocado", "list"]
-        return ["avocado", "--paginator=off", "list"]
-
-    def get_list_regex(self):
-        """Get the regular expression used to get the test file from the avocado list command.
-
-        Returns:
-            str: regular expression to use to get the test file from the avocado list command output
-        """
-        if self.major >= 92:
-            return r"avocado-instrumented\s+(.*):"
-        return r"INSTRUMENTED\s+(.*):"
-
     def get_run_command(self, test, tag_filters, sparse, failfast):
         """Get the avocado run command for this version of avocado.
 

src/tests/ftest/util/launch_utils.py

@@ -1,13 +1,15 @@
 """
-  (C) Copyright 2022-2023 Intel Corporation.
+  (C) Copyright 2022-2024 Intel Corporation.
 
   SPDX-License-Identifier: BSD-2-Clause-Patent
 """
 # pylint: disable=too-many-lines
+import json
 import logging
 import os
 import re
 import sys
+import tempfile
 import time
 from pathlib import Path
 
@@ -794,21 +796,45 @@ def list_tests(self, logger, verbose):
                     tag = ",".join((tag, fault_tag))
                 self.tag_filters.append(f"--filter-by-tags={tag}")
 
-        # Get the avocado list command to find all the tests that match the specified files and tags
-        command = self._avocado.get_list_command()
-        command.extend(self.tag_filters)
-        command.extend(test_files)
-        if not test_files:
-            command.append("./")
+        if self._avocado.major > 82:
+            with tempfile.NamedTemporaryFile() as tmpf:
+                command = ["avocado", "list", "--json", tmpf.name]
+                command.extend(self.tag_filters)
+                command.extend(test_files)
+                if not test_files:
+                    command.append("./")
+
+                # Find all the test files that contain tests matching the tags
+                logger.debug("-" * 80)
+                logger.info("Detecting tests matching tags: %s", " ".join(command))
+                run_local(logger, " ".join(command), check=True)
+                data = json.load(tmpf)
+                index = 1
+                for test in data:
+                    if test["Type"] != "avocado-instrumented":
+                        continue
+                    test_name = test["Test"].split(":")[0]
+                    self.tests.append(TestInfo(test_name, index, self._yaml_extension))
+                    index += 1
+                    logger.info("  %s", self.tests[-1])
 
-        # Find all the test files that contain tests matching the tags
-        logger.debug("-" * 80)
-        logger.info("Detecting tests matching tags: %s", " ".join(command))
-        output = run_local(logger, " ".join(command), check=True)
-        unique_test_files = set(re.findall(self._avocado.get_list_regex(), output.stdout))
-        for index, test_file in enumerate(unique_test_files):
-            self.tests.append(TestInfo(test_file, index + 1, self._yaml_extension))
-            logger.info("  %s", self.tests[-1])
+        else:
+            # Get the avocado list command to find all the tests that match the specified files and
+            # #tags
+            command = ["avocado", "--paginator=off", "list"]
+            command.extend(self.tag_filters)
+            command.extend(test_files)
+            if not test_files:
+                command.append("./")
+
+            # Find all the test files that contain tests matching the tags
+            logger.debug("-" * 80)
+            logger.info("Detecting tests matching tags: %s", " ".join(command))
+            output = run_local(logger, " ".join(command), check=True)
+            unique_test_files = set(re.findall(r"INSTRUMENTED\s+(.*):", output.stdout))
+            for index, test_file in enumerate(unique_test_files):
+                self.tests.append(TestInfo(test_file, index + 1, self._yaml_extension))
+                logger.info("  %s", self.tests[-1])
 
         # List all of the possible tags if no matches where found and verbose is set
         if not self.tests and verbose:

utils/ansible/ftest/vars/defaults.yml

@@ -1,4 +1,4 @@
 # Install dependencies of a development node
 
 daos_avocado_version_default: 2.4.3
-daos_avocado_framework_version_default: 82
+daos_avocado_framework_version_default: 92