add/update tests

Author: grassesi

tests/test_cli.py

@@ -6,7 +6,7 @@
 
 DATE_FORMATS = ["2022-12-01T00:00:00", "20221201", "2022-12-01", "12.01.2022"]
 EXPECTED_DATE_STR = "202212010000"
-MODEL_LOADING_ARGS = ["from_run_id", "epoch"]
+MODEL_LOADING_ARGS = ["from_run_id", "epoch", "reuse_run_id"]
 GENERAL_ARGS = ["config", "private_config", "options", "run_id"]
 MODEL_LOADING_PARSERS = [cli.get_continue_parser(), cli.get_evaluate_parser()]
 BASIC_ARGLIST = ["--from_run_id", "test123"]

tests/test_config.py

@@ -6,6 +6,7 @@
 
 import weathergen.utils.config as config
 
+TEST_RUN_ID = "test123"
 SECRET_COMPONENT = "53CR3T"
 DUMMY_PRIVATE_CONF = {
     "data_path_anemoi": "/path/to/anmoi/data",
@@ -144,6 +145,7 @@ def overwrite_file(overwrite_config):
 @pytest.fixture
 def config_fresh(private_config_file):
     cf = config.load_config(private_config_file, None, None)
+    config.set_run_id(cf, TEST_RUN_ID, False)
     cf.data_loader_rng_seed = 42
 
     return cf
@@ -188,14 +190,12 @@ def test_load_multiple_overwrites(private_config_file):
 
 @pytest.mark.parametrize("epoch", [None, 0, 1, 2, -1])
 def test_load_existing_config(epoch, private_config_file, config_fresh):
-    test_run_id = "test123"
     test_num_epochs = 3000
 
-    config_fresh.run_id = test_run_id  # done in trainer
     config_fresh.num_epochs = test_num_epochs  # some specific change
     config.save(config_fresh, epoch)
 
-    cf = config.load_config(private_config_file, test_run_id, epoch)
+    cf = config.load_config(private_config_file, config_fresh.run_id, epoch)
 
     assert cf.num_epochs == test_num_epochs
 
@@ -205,7 +205,13 @@ def test_from_cli(options, cf):
     parsed_config = config.from_cli_arglist(options)
 
     assert parsed_config == OmegaConf.create(cf)
-
+@pytest.mark.parametrize("run_id,reuse,expected", [(None, False, "generated"), ("new_id", False, "new_id"), (None, True, TEST_RUN_ID), ("new_id", True, TEST_RUN_ID)])
+def test_set_run_id(config_fresh, run_id, reuse, expected, mocker):
+    patch = mocker.patch("weathergen.utils.config.get_run_id", return_value="generated")
+    
+    config.set_run_id(config_fresh, run_id, reuse)    
+    
+    assert config_fresh.run_id == expected
 
 def test_print_cf_no_secrets(config_fresh):
     output = config._format_cf(config_fresh)
@@ -243,9 +249,7 @@ def test_load_malformed_stream(streams_dir):
 
 @pytest.mark.parametrize("epoch", [None, 0, 1, 2, -1])  # maybe add -5 as test case
 def test_save(epoch, config_fresh):
-    test_run_id = "test123"
-    config_fresh.run_id = test_run_id
     config.save(config_fresh, epoch)
 
-    cf = config.load_model_config(test_run_id, epoch, config_fresh.model_path)
-    assert is_equal(cf, config_fresh)
+    cf = config.load_model_config(config_fresh.run_id, epoch, config_fresh.model_path)
+    assert is_equal(cf, config_fresh)