From b47b934a41e70d209a9d4c60c3a3df3f4e7264bd Mon Sep 17 00:00:00 2001 From: Jacopo De Amicis Date: Fri, 12 Jan 2024 15:56:19 +0100 Subject: [PATCH] Change suffix for external dbd unit test case The suffix `_external_slurmdbd` led to confusion with the base name of the `slurmdbd.conf` include file generated by ParallelCluster. Switch to `_externaldbd` suffix to for more clarity. Signed-off-by: Jacopo De Amicis --- test/unit/slurm/test_slurm_config_generator.py | 5 +++-- ..._slurmdbd.conf => slurm_parallelcluster_externaldbd.conf} | 0 ....conf => slurm_parallelcluster_slurmdbd_externaldbd.conf} | 0 ..._external_slurmdbd.yaml => sample_input_externaldbd.yaml} | 0 4 files changed, 3 insertions(+), 2 deletions(-) rename test/unit/slurm/test_slurm_config_generator/test_generate_slurm_config_files_slurm_accounting/expected_outputs/{slurm_parallelcluster_external_slurmdbd.conf => slurm_parallelcluster_externaldbd.conf} (100%) rename test/unit/slurm/test_slurm_config_generator/test_generate_slurm_config_files_slurm_accounting/expected_outputs/{slurm_parallelcluster_slurmdbd_external_slurmdbd.conf => slurm_parallelcluster_slurmdbd_externaldbd.conf} (100%) rename test/unit/slurm/test_slurm_config_generator/test_generate_slurm_config_files_slurm_accounting/{sample_input_external_slurmdbd.yaml => sample_input_externaldbd.yaml} (100%) diff --git a/test/unit/slurm/test_slurm_config_generator.py b/test/unit/slurm/test_slurm_config_generator.py index 32e3e6e870..5cdb4531b4 100644 --- a/test/unit/slurm/test_slurm_config_generator.py +++ b/test/unit/slurm/test_slurm_config_generator.py @@ -129,9 +129,10 @@ def test_generate_slurm_config_files_memory_scheduling( id="Case with Slurm Accounting passing DatabaseName", ), pytest.param( - "sample_input_external_slurmdbd.yaml", + "sample_input_externaldbd.yaml", [ - "slurm_parallelcluster_external_slurmdbd.conf", + "slurm_parallelcluster_externaldbd.conf", + "slurm_parallelcluster_slurmdbd_externaldbd.conf", ], id="Case with Slurmdbd daemon external to the cluster", ), diff --git a/test/unit/slurm/test_slurm_config_generator/test_generate_slurm_config_files_slurm_accounting/expected_outputs/slurm_parallelcluster_external_slurmdbd.conf b/test/unit/slurm/test_slurm_config_generator/test_generate_slurm_config_files_slurm_accounting/expected_outputs/slurm_parallelcluster_externaldbd.conf similarity index 100% rename from test/unit/slurm/test_slurm_config_generator/test_generate_slurm_config_files_slurm_accounting/expected_outputs/slurm_parallelcluster_external_slurmdbd.conf rename to test/unit/slurm/test_slurm_config_generator/test_generate_slurm_config_files_slurm_accounting/expected_outputs/slurm_parallelcluster_externaldbd.conf diff --git a/test/unit/slurm/test_slurm_config_generator/test_generate_slurm_config_files_slurm_accounting/expected_outputs/slurm_parallelcluster_slurmdbd_external_slurmdbd.conf b/test/unit/slurm/test_slurm_config_generator/test_generate_slurm_config_files_slurm_accounting/expected_outputs/slurm_parallelcluster_slurmdbd_externaldbd.conf similarity index 100% rename from test/unit/slurm/test_slurm_config_generator/test_generate_slurm_config_files_slurm_accounting/expected_outputs/slurm_parallelcluster_slurmdbd_external_slurmdbd.conf rename to test/unit/slurm/test_slurm_config_generator/test_generate_slurm_config_files_slurm_accounting/expected_outputs/slurm_parallelcluster_slurmdbd_externaldbd.conf diff --git a/test/unit/slurm/test_slurm_config_generator/test_generate_slurm_config_files_slurm_accounting/sample_input_external_slurmdbd.yaml b/test/unit/slurm/test_slurm_config_generator/test_generate_slurm_config_files_slurm_accounting/sample_input_externaldbd.yaml similarity index 100% rename from test/unit/slurm/test_slurm_config_generator/test_generate_slurm_config_files_slurm_accounting/sample_input_external_slurmdbd.yaml rename to test/unit/slurm/test_slurm_config_generator/test_generate_slurm_config_files_slurm_accounting/sample_input_externaldbd.yaml