diff --git a/src/integrationtest/integrationtest_drunc.py b/src/integrationtest/integrationtest_drunc.py index ec7a09a..233d0b6 100755 --- a/src/integrationtest/integrationtest_drunc.py +++ b/src/integrationtest/integrationtest_drunc.py @@ -115,22 +115,9 @@ def pytest_generate_tests(metafunc): # create an entry for the default choice of ssh-standalone metafunc.module.process_manager_choices = { "StandAloneSSH_PM" : "ssh-standalone" } - # 27-Feb-2026, KAB: support for the nanorc --> dunerc transition - # We will be able to remove the following two lines once all integtests - # have been converted to use dunerc instead of nanorc. - if not hasattr(metafunc.module, "dunerc_command_list") and hasattr(metafunc.module, "nanorc_command_list"): - metafunc.module.dunerc_command_list = metafunc.module.nanorc_command_list - parametrize_fixture_with_items(metafunc, "create_config_files", "confgen_arguments") parametrize_fixture_with_items(metafunc, "process_manager_type", "process_manager_choices") - - # 27-Feb-2026, KAB: support for the nanorc --> dunerc transition - # We will be able to just use "run_dunerc" once all integtests - # have been converted to use dunerc instead of nanorc. - if "run_nanorc" in metafunc.fixturenames: - parametrize_fixture_with_items(metafunc, "run_nanorc", "dunerc_command_list") - if "run_dunerc" in metafunc.fixturenames: - parametrize_fixture_with_items(metafunc, "run_dunerc", "dunerc_command_list") + parametrize_fixture_with_items(metafunc, "run_dunerc", "dunerc_command_list") # determine the number of different parametrizations # (recall that this fixture is called once per pytest function in each integtest) @@ -440,12 +427,6 @@ def apply_update(obj, substitution): yield result -# 27-Feb-2026, KAB: support for the nanorc --> dunerc transition -# Temporary fixture until all integtests have been changed to use "dunerc". -@pytest.fixture(scope="module") -def run_nanorc(run_dunerc): - yield run_dunerc - @pytest.fixture(scope="module") def run_dunerc(request, create_config_files, process_manager_type, tmp_path_factory): """Run drunc with the OKS DB files created by `create_config_files`. The @@ -749,9 +730,6 @@ class RunResult: result.confgen_config = create_config_files.config result.config_session_name = create_config_files.config.config_session_name result.daq_session_name = create_config_files.config.daq_session_name - # 27-Feb-2026, KAB: the nanorc_commands return value can be removed once - # all integtests have been changed to use "dunerc". - result.nanorc_commands = run_control_commands result.dunerc_commands = run_control_commands result.run_dir = run_dir result.config_dir = create_config_files.config_dir