diff --git a/lib/ramble/ramble/test/modifier_functionality/mock_modifier_phases.py b/lib/ramble/ramble/test/modifier_functionality/mock_modifier_phases.py index b57450522..15fce12f1 100644 --- a/lib/ramble/ramble/test/modifier_functionality/mock_modifier_phases.py +++ b/lib/ramble/ramble/test/modifier_functionality/mock_modifier_phases.py @@ -54,37 +54,30 @@ def test_gromacs_dry_run_mock_mod_phase( out_file = os.path.join(ws1.log_dir, "setup.latest", "gromacs.water_bare.test_exp.out") - found_phase = False found_make_experiments = False found_after_phase = False - found_first_phase = False - phase_regex = re.compile("Executing phase.*") - first_phase_regex = re.compile("Executing phase first_phase") + found_mod_phase = False + mod_phase_regex = re.compile("Executing phase mod_phase") make_experiments_regex = re.compile("Executing phase make_experiments") after_make_experiments_regex = re.compile("Executing phase after_make_experiments") with open(out_file) as f: for line in f.readlines(): - if first_phase_regex.search(line): - assert not found_phase - found_first_phase = True - - if phase_regex.search(line): - found_phase = True + if mod_phase_regex.search(line): + found_mod_phase = True if make_experiments_regex.search(line): - assert found_phase + assert found_mod_phase found_make_experiments = True if after_make_experiments_regex.search(line): assert found_make_experiments found_after_phase = True - assert found_phase - assert found_first_phase + assert found_mod_phase assert found_after_phase - expected_str = "Inside a phase: first_phase" + expected_str = "Inside a phase: mod_phase" assert search_files_for_string(out_files, expected_str) diff --git a/var/ramble/repos/builtin.mock/modifiers/mod-phase/modifier.py b/var/ramble/repos/builtin.mock/modifiers/mod-phase/modifier.py index f96cee301..3a9148902 100644 --- a/var/ramble/repos/builtin.mock/modifiers/mod-phase/modifier.py +++ b/var/ramble/repos/builtin.mock/modifiers/mod-phase/modifier.py @@ -19,10 +19,12 @@ class ModPhase(BasicModifier): mode("test", description="This is a test mode") - register_phase("first_phase", pipeline="setup", run_before=["get_inputs"]) + register_phase( + "mod_phase", pipeline="setup", run_before=["make_experiments"] + ) - def _first_phase(self, workspace, app_inst=None): - logger.all_msg("Inside a phase: first_phase") + def _mod_phase(self, workspace, app_inst=None): + logger.all_msg("Inside a phase: mod_phase") register_phase( "after_make_experiments",