From 982b4100015ca70f59c93e77d734270c438d450a Mon Sep 17 00:00:00 2001 From: Ashley Pittman Date: Tue, 9 Apr 2024 13:07:50 +0000 Subject: [PATCH] Remove dead code. Signed-off-by: Ashley Pittman --- src/tests/ftest/util/avocado_utils.py | 20 -------------------- src/tests/ftest/util/launch_utils.py | 1 - 2 files changed, 21 deletions(-) diff --git a/src/tests/ftest/util/avocado_utils.py b/src/tests/ftest/util/avocado_utils.py index 4e7d7b09e61..525f590c3e5 100644 --- a/src/tests/ftest/util/avocado_utils.py +++ b/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. diff --git a/src/tests/ftest/util/launch_utils.py b/src/tests/ftest/util/launch_utils.py index 5700158b628..a0a9c857e24 100644 --- a/src/tests/ftest/util/launch_utils.py +++ b/src/tests/ftest/util/launch_utils.py @@ -679,7 +679,6 @@ def _generate_certs(self, logger): certs_dir = os.path.join(test_env.log_dir, "daosCA") certgen_dir = os.path.abspath( os.path.join("..", "..", "..", "..", "lib64", "daos", "certgen")) -# os.path.join("..", "..", "..", "install", "lib64", "daos", "certgen")) command = os.path.join(certgen_dir, "gen_certificates.sh") try: run_local(logger, f"/usr/bin/rm -rf {certs_dir}")