Skip to content

Commit

Permalink
Remove 'concretized' flag from test configs
Browse files Browse the repository at this point in the history
  • Loading branch information
dapomeroy committed Mar 21, 2024
1 parent f1e0dce commit 2f25397
Show file tree
Hide file tree
Showing 40 changed files with 0 additions and 44 deletions.
1 change: 0 additions & 1 deletion lib/ramble/ramble/test/application_tests.py
Original file line number Diff line number Diff line change
Expand Up @@ -486,7 +486,6 @@ def test_derive_variables_for_template_path(mutable_mock_apps_repo):
n_nodes: '2'
spack:
concretized: true
packages: {}
environments: {}
"""
Expand Down
1 change: 0 additions & 1 deletion lib/ramble/ramble/test/concretize_builtin.py
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,6 @@ def test_concretize_does_not_set_required(mutable_config, mutable_mock_workspace
matrix:
- n_nodes
spack:
concretized: false
packages: {}
environments: {}
"""
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,6 @@ def test_chained_experiment_variable_inheritance(mutable_config,
variables:
n_nodes: '2'
spack:
concretized: true
packages:
gcc:
spack_spec: [email protected] target=x86_64
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@ def test_config_section_env_vars(mutable_config, mutable_mock_workspace_path, mo
variables:
n_nodes: 1
spack:
concretized: true
packages: {}
environments: {}
"""
Expand Down
1 change: 0 additions & 1 deletion lib/ramble/ramble/test/end_to_end/custom_executables.py
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,6 @@ def test_custom_executables(mutable_config, mutable_mock_workspace_path, mock_ap
MY_VAR: 'TEST'
OTHER_ENV_VAR: 'ANOTHER_TEST'
spack:
concretized: true
packages: {}
environments: {}
"""
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,6 @@ def test_dryrun_chained_experiments(mutable_config,
variables:
n_nodes: '2'
spack:
concretized: true
packages:
gcc:
spack_spec: [email protected] target=x86_64
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,6 @@ def test_dryrun_copies_external_env(mutable_config, mutable_mock_workspace_path,
variables:
n_nodes: '1'
spack:
concretized: true
packages: {{}}
environments:
wrfv4:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@ def test_dryrun_series_contains_package_paths(mutable_config,
n_nodes: '1'
test_id: [1, 2]
spack:
concretized: true
packages:
zlib:
spack_spec: zlib
Expand Down
1 change: 0 additions & 1 deletion lib/ramble/ramble/test/end_to_end/env_var_builtin.py
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,6 @@ def test_env_var_builtin(mutable_config, mutable_mock_workspace_path, mock_appli
set:
MY_VAR: 'TEST'
spack:
concretized: true
packages: {}
environments: {}
"""
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@ def test_exclusive_filtered_vector_workloads(mutable_config, mutable_mock_worksp
application_workload: ['parallel' ,'serial', 'local']
n_nodes: 1
spack:
concretized: true
packages: {}
environments: {}
"""
Expand Down
1 change: 0 additions & 1 deletion lib/ramble/ramble/test/end_to_end/expanded_fom_dry_run.py
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@ def test_expanded_foms_dry_run(mutable_config,
n_nodes: 1
n_ranks: 1
spack:
concretized: false
packages: {}
environments: {}
"""
Expand Down
1 change: 0 additions & 1 deletion lib/ramble/ramble/test/end_to_end/experiment_excludes.py
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,6 @@ def test_wrfv4_exclusions(mutable_config, mutable_mock_workspace_path):
where:
- '{n_nodes} == 16'
spack:
concretized: true
packages:
gcc:
spack_spec: [email protected]
Expand Down
1 change: 0 additions & 1 deletion lib/ramble/ramble/test/end_to_end/experiment_repeats.py
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,6 @@ def test_gromacs_repeats(mutable_config, mutable_mock_workspace_path):
size: '0003'
type: 'pme'
spack:
concretized: true
packages:
gcc:
spack_spec: [email protected]
Expand Down
1 change: 0 additions & 1 deletion lib/ramble/ramble/test/end_to_end/explicit_zips.py
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,6 @@ def test_wrfv4_explicit_zips(mutable_config, mutable_mock_workspace_path):
- environments
- partitions
spack:
concretized: true
packages:
gcc:
spack_spec: [email protected]
Expand Down
2 changes: 0 additions & 2 deletions lib/ramble/ramble/test/end_to_end/formatted_executables.py
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,6 @@ def test_formatted_executables(mutable_config, mutable_mock_workspace_path, mock
variables:
n_nodes: 1
spack:
concretized: true
packages: {}
environments: {}
"""
Expand Down Expand Up @@ -115,7 +114,6 @@ def test_redefined_executable_errors(mutable_config, mutable_mock_workspace_path
var_exec_name: 'nothing'
n_nodes: 1
spack:
concretized: true
packages: {}
environments: {}
"""
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@ def test_gromacs_size_expansion(mutable_config, mutable_mock_workspace_path):
n_nodes: '1'
size: '0000.96'
spack:
concretized: true
packages:
gcc:
spack_spec: [email protected]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@ def test_inclusive_filtered_vector_workloads(mutable_config, mutable_mock_worksp
application_workload: ['parallel' ,'serial', 'local']
n_nodes: 1
spack:
concretized: true
packages: {}
environments: {}
"""
Expand Down
1 change: 0 additions & 1 deletion lib/ramble/ramble/test/end_to_end/known_applications.py
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,6 @@ def test_known_applications(application, capsys):
n_nodes: '1'
processes_per_node: '1'\n""")
f.write(""" spack:
concretized: false
packages: {}
environments: {}\n""")

Expand Down
2 changes: 0 additions & 2 deletions lib/ramble/ramble/test/end_to_end/merge_config_files.py
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@ def test_merge_config_files(mutable_config, mutable_mock_workspace_path, mock_ap

test_spack = """
spack:
concretized: true
packages:
zlib:
spack_spec: [email protected]
Expand All @@ -56,7 +55,6 @@ def test_merge_config_files(mutable_config, mutable_mock_workspace_path, mock_ap
n_threads: '1'
applications: {}
spack:
concretized: false
packages: {}
environments: {}
"""
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@ def test_missing_required_dry_run(mutable_config, mutable_mock_workspace_path):
variables:
n_nodes: '8'
spack:
concretized: true
packages:
gcc8:
spack_spec: [email protected] target=x86_64
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,6 @@ def test_nested_compilers_are_installed(mutable_config, mutable_mock_workspace_p
variables:
n_nodes: '1'
spack:
concretized: true
packages:
gcc8:
spack_spec: [email protected]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@ def test_package_manager_config_zlib(mock_applications):
test:
variables: {}
spack:
concretized: true
packages:
zlib:
spack_spec: 'zlib'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@ def test_package_manager_requirements_zlib(mock_applications, mock_modifiers):
test:
variables: {}
spack:
concretized: true
packages: {}
environments:
zlib-configs:
Expand Down Expand Up @@ -94,7 +93,6 @@ def test_package_manager_requirements_error(mock_applications, mock_modifiers):
test:
variables: {}
spack:
concretized: true
packages: {}
environments:
zlib-configs:
Expand Down
2 changes: 0 additions & 2 deletions lib/ramble/ramble/test/end_to_end/passthrough_variables.py
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@ def test_passthrough_variables(mutable_config, mutable_mock_workspace_path, mock
variables:
n_nodes: 1
spack:
concretized: true
packages: {}
environments: {}
"""
Expand Down Expand Up @@ -94,7 +93,6 @@ def test_disable_passthrough(mutable_config, mutable_mock_workspace_path):
mpi_command: '{undefined_var}'
n_ranks: '1'
spack:
concretized: true
packages: {}
environments: {}
"""
Expand Down
1 change: 0 additions & 1 deletion lib/ramble/ramble/test/end_to_end/phase_selection.py
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,6 @@ def test_workspace_phase_selection(mutable_config, mutable_mock_workspace_path,
- n_nodes
- env_name
spack:
concretized: true
packages:
gcc:
spack_spec: [email protected]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,6 @@ def test_workspace_phase_selection_with_dependencies(mutable_config,
- n_nodes
- env_name
spack:
concretized: true
packages:
gcc:
spack_spec: [email protected]
Expand Down
1 change: 0 additions & 1 deletion lib/ramble/ramble/test/end_to_end/shared_context.py
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,6 @@ def test_shared_contexts(
variables:
n_nodes: 1
spack:
concretized: true
packages: {}
environments: {}
"""
Expand Down
1 change: 0 additions & 1 deletion lib/ramble/ramble/test/end_to_end/tag_filtering.py
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,6 @@ def test_workspace_tag_filtering(mutable_config, mutable_mock_workspace_path,
variables:
n_nodes: 1
spack:
concretized: true
packages: {}
environments: {}
"""
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,6 @@ def test_configvar_dry_run(mutable_config, mutable_mock_workspace_path):
variables:
n_ranks: "{{{var_name}}}"
spack:
concretized: true
packages:
gcc:
spack_spec: [email protected]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,6 @@ def test_unused_compilers_are_skipped(mutable_config, mutable_mock_workspace_pat
variables:
n_nodes: '1'
spack:
concretized: true
packages:
gcc8:
spack_spec: [email protected]
Expand Down
1 change: 0 additions & 1 deletion lib/ramble/ramble/test/end_to_end/vector_workloads.py
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@ def test_vector_workloads(mutable_config, mutable_mock_workspace_path):
application_workload: ['parallel' ,'serial', 'local']
n_nodes: 1
spack:
concretized: true
packages: {}
environments: {}
"""
Expand Down
1 change: 0 additions & 1 deletion lib/ramble/ramble/test/end_to_end/wrfv4_dry_run.py
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,6 @@ def test_wrfv4_dry_run(mutable_config, mutable_mock_workspace_path):
- n_nodes
- env_name
spack:
concretized: true
packages:
gcc:
spack_spec: [email protected]
Expand Down
1 change: 0 additions & 1 deletion lib/ramble/ramble/test/mirror_tests.py
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,6 @@ def test_mirror_create(tmpdir,
n_nodes: '1'
processes_per_node: '1'
spack:
concretized: true
packages: {{}}
environments: {{}}
"""
Expand Down
1 change: 0 additions & 1 deletion lib/ramble/ramble/test/modifier_application.py
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,6 @@ def test_wrfv4_aps_test(mutable_config, mutable_mock_workspace_path):
variables:
n_nodes: '1'
spack:
concretized: true
packages:
gcc:
spack_spec: [email protected]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@ def test_always_print_foms(mutable_config,
variables:
n_nodes: 1
spack:
concretized: true
packages: {}
environments: {}
"""
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@ def test_repeat_success_strict(mutable_config,
variables:
n_nodes: 1
spack:
concretized: true
packages: {}
environments: {}
"""
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@ def test_success_function(mutable_config,
variables:
n_nodes: 1
spack:
concretized: true
packages: {}
environments: {}
"""
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,6 @@ def test_unsetup_workspace_cannot_analyze(mutable_config,
set:
MY_VAR: 'TEST'
spack:
concretized: true
packages:
zlib:
spack_spec: zlib
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@ def test_workspace_name_does_not_change_hash(mutable_config,
set:
MY_VAR: 'TEST'
spack:
concretized: true
packages: {}
environments: {}
"""
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,6 @@ def test_workspace_setup_creates_inventory(mutable_config,
set:
MY_VAR: 'TEST'
spack:
concretized: true
packages: {}
environments: {}
"""
Expand Down

0 comments on commit 2f25397

Please sign in to comment.