adjusting copy of experiment that didn't copy the experiment with the HPC send through command

Author: VindeeR

autosubmit/autosubmit.py

@@ -1367,8 +1367,8 @@ def replace_parameter_inside_section(content, parameter, new_value, section):
         return content
 
     @staticmethod
-    def as_conf_default_values(exp_id, hpc, minimal_configuration=False, git_repo="", git_branch="main",
-                               git_as_conf=""):
+    def as_conf_default_values(exp_id:str, hpc:str = "local", minimal_configuration:bool = False, git_repo:str = "",
+                               git_branch:str = "main", git_as_conf:str = "") -> None:
         """
         Replace default values in as_conf files
         :param exp_id: experiment id
@@ -1380,7 +1380,6 @@ def as_conf_default_values(exp_id, hpc, minimal_configuration=False, git_repo=""
         :return: None
         """
         # the var hpc was hardcoded in the header of the function
-        hpc_default = "local"
 
         # open and replace values
         for as_conf_file in Path(BasicConfig.LOCAL_ROOT_DIR, f"{exp_id}/conf").iterdir():
@@ -1404,12 +1403,13 @@ def as_conf_default_values(exp_id, hpc, minimal_configuration=False, git_repo=""
                         x = search.group(0).split(":")
                         # clean blank space, quotes and double quote
                         aux = x[1].strip(' "\'')
-                        # hpc in config is empty && -H is empty-> hpc_default will be introduced
-                        if len(aux) == 0 and not hpc:
-                            content = content.replace(search.group(0), f"HPCARCH: \"{hpc_default}\"")
                         # hpc in config is empty && -H has a value-> write down hpc value
-                        elif len(aux) == 0:
+                        if hpc != "":
                             content = content.replace(search.group(0), f"HPCARCH: \"{hpc}\"")
+                        elif len(aux) > 0:
+                            content = content.replace(search.group(0), f"HPCARCH: \"{aux}\"")
+                        else:
+                            content = content.replace(search.group(0), "HPCARCH: \"local\"")
                         # the other case is aux!=0 that we dont care about val(hpc) because its a copyExpId
                     if minimal_configuration:
                         search = re.search('CUSTOM_CONFIG: .*', content, re.MULTILINE)

test/integration/test_expid.py

@@ -199,6 +199,36 @@ def test_create_expid_flag_hpc(fake_hpc: str, expected_hpc: str, autosubmit: Aut
     assert hpc_result_experiment == expected_hpc
 
 
+@pytest.mark.parametrize("experiment_hpc,expected_hpc", [
+    ("local","mn5"),
+    ("mn5","marenostrum"), ])
+def test_copy_expid_with_flag_hpc(tmp_path: Path, autosubmit: Autosubmit, experiment_hpc, expected_hpc):
+    """Create expid using the flag -H. Defining a value for the flag and not defining any value for that flag.
+
+    code-block:: console
+
+        autosubmit expid -H ithaca -d "experiment"
+        autosubmit expid -H "" -d "experiment"
+
+    :param fake_hpc: The value for the -H flag (hpc value).
+    :param expected_hpc: The value it is expected for the variable hpc.
+    :param autosubmit: Autosubmit interface that instantiate with no experiment.
+    """
+    autosubmit.install()
+
+    exp_id = autosubmit.expid('experiment', hpc=experiment_hpc, minimal_configuration=True)
+    copy_exp = autosubmit.expid('copy', hpc=expected_hpc , copy_id=exp_id, minimal_configuration=True)
+
+    describe = autosubmit.describe(exp_id)
+    hpc_experiment = describe[4].lower()
+
+    describe_copy = autosubmit.describe(copy_exp)
+    hpc_experiment_copy = describe_copy[4].lower()
+
+    assert hpc_experiment != hpc_experiment_copy
+    assert hpc_experiment_copy == expected_hpc
+
+
 @pytest.mark.parametrize("fake_hpc,expected_hpc", [
     ("mn5", "mn5"),
     ("", "local"),
@@ -253,7 +283,7 @@ def test_copy_expid_no(autosubmit: Autosubmit):
     describe = autosubmit.describe(copy_experiment_id)
     hpc_result = describe[4].lower()
 
-    assert hpc_result != new_hpc
+    assert hpc_result == new_hpc
 
 
 def _get_experiment_data(tmp_path):