Skip to content

Commit

Permalink
fix unit test and remove conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
rfbgo committed May 24, 2024
1 parent a0e00a5 commit 8115c6f
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 3 deletions.
7 changes: 4 additions & 3 deletions lib/ramble/ramble/language/application_language.py
Original file line number Diff line number Diff line change
Expand Up @@ -98,10 +98,11 @@ def workload_group(name, workloads=[], mode=None, **kwargs):
workloads: A list of workloads to be grouped
"""

def _execute_workload(app):
def _execute_workload_groups(app):
# TODO where is it best to validate the workloads
if mode == 'append': # TODO: dry magic enum string
app.workload_groups[name] += workloads
#app.workload_groups[name] += workloads
app.workload_groups[name] = workloads + app.workload_groups[name]
else:
app.workload_groups[name] = workloads

Expand All @@ -111,7 +112,7 @@ def _execute_workload(app):
for var in app.workload_group_vars[name]:
app.workloads[workload].add_variable(var)

return _execute_workload
return _execute_workload_groups


@application_directive('executables')
Expand Down
15 changes: 15 additions & 0 deletions lib/ramble/ramble/test/application_tests.py
Original file line number Diff line number Diff line change
Expand Up @@ -536,6 +536,21 @@ def test_derive_variables_for_template_path(mutable_mock_apps_repo):
assert executable_application_instance.variables['execute_experiment'] == test_answer


def test_class_attributes(mutable_mock_apps_repo):
basic_inst = mutable_mock_apps_repo.get('basic')
basic_copy = basic_inst.copy()

instances = [basic_inst, basic_copy]
for inst in instances:
assert hasattr(inst, 'workloads')
assert 'test_wl' in inst.workloads

basic_copy.workload('added_workload', executables=['foo'])

assert 'added_workload' in basic_copy.workloads
assert 'added_workload' not in basic_inst.workloads


def test_workload_groups(mutable_mock_apps_repo):
workload_group_inst = mutable_mock_apps_repo.get('workload-groups')

Expand Down

0 comments on commit 8115c6f

Please sign in to comment.