Skip to content
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

Update the mod test to not assume the first phase #736

Merged
merged 4 commits into from
Oct 30, 2024
Merged

Update the mod test to not assume the first phase #736

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
842cc9a
Merge pull request #40 from GoogleCloudPlatform/develop
linsword13 Oct 29, 2024
27e9aa8
Merge branch 'GoogleCloudPlatform:develop' into develop
linsword13 Oct 30, 2024
71a827e
Merge branch 'GoogleCloudPlatform:develop' into develop
linsword13 Oct 30, 2024
52762f1
Update the mod test to not assume the first phase
linsword13 Oct 30, 2024
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
21 changes: 7 additions & 14 deletions lib/ramble/ramble/test/modifier_functionality/mock_modifier_phases.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
8 changes: 5 additions & 3 deletions var/ramble/repos/builtin.mock/modifiers/mod-phase/modifier.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down