Skip to content

Finished the removal of the name "nanorc" from the integrationtest infrastructure #156

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
bieryAtFnal wants to merge 2 commits into
base: develop
Choose a base branch
from
Open

Finished the removal of the name "nanorc" from the integrationtest infrastructure #156

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1972a55
Removed the last few references to nanorc in integrationtest_drunc.py
May 13, 2026
43fab08
Merge remote-tracking branch 'origin/develop' into kbiery/final_nanor…
May 19, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 1 addition & 23 deletions src/integrationtest/integrationtest_drunc.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down