fixed tests (finally)

tests/test_base_worker.py

@@ -49,7 +49,8 @@ def test_init_var_worker_version_id_missing(monkeypatch):
     monkeypatch.setattr(sys, "argv", ["worker"])
     monkeypatch.delenv("WORKER_VERSION_ID")
     worker = BaseWorker()
-    worker.configure()
+    worker.args = worker.parser.parse_args()
+    worker.configure_for_developers()
     assert worker.worker_version_id is None
     assert worker.is_read_only is True
     assert worker.config == {}  # default empty case
@@ -63,7 +64,8 @@ def test_init_var_worker_local_file(monkeypatch, tmp_path):
     monkeypatch.setattr(sys, "argv", ["worker", "-c", str(config)])
     monkeypatch.delenv("WORKER_VERSION_ID")
     worker = BaseWorker()
-    worker.configure()
+    worker.args = worker.parser.parse_args()
+    worker.configure_for_developers()
     assert worker.worker_version_id is None
     assert worker.is_read_only is True
     assert worker.config == {"localKey": "abcdef123"}  # Use a local file for devs
@@ -71,12 +73,13 @@ def test_init_var_worker_local_file(monkeypatch, tmp_path):
     config.unlink()
 
 
-def test_cli_default(mocker):
+def test_cli_default(mocker, mock_config_api):
     worker = BaseWorker()
     assert logger.level == logging.NOTSET
     assert not hasattr(worker, "api_client")
 
     mocker.patch.object(sys, "argv", ["worker"])
+    worker.args = worker.parser.parse_args()
     worker.configure()
     assert not worker.args.verbose
     assert logger.level == logging.NOTSET
@@ -88,18 +91,14 @@ def test_cli_default(mocker):
     logger.setLevel(logging.NOTSET)
 
 
-def test_cli_arg_verbose_given(mocker):
+def test_cli_arg_verbose_given(mocker, mock_config_api):
     worker = BaseWorker()
-    spy = mocker.spy(worker, "add_arguments")
-    assert not spy.called
     assert logger.level == logging.NOTSET
     assert not hasattr(worker, "api_client")
 
     mocker.patch.object(sys, "argv", ["worker", "-v"])
+    worker.args = worker.parser.parse_args()
     worker.configure()
-
-    assert spy.called
-    assert spy.call_count == 1
     assert worker.args.verbose
     assert logger.level == logging.DEBUG
     assert worker.api_client
@@ -110,14 +109,14 @@ def test_cli_arg_verbose_given(mocker):
     logger.setLevel(logging.NOTSET)
 
 
-def test_cli_envvar_debug_given(mocker, monkeypatch):
+def test_cli_envvar_debug_given(mocker, monkeypatch, mock_config_api):
     worker = BaseWorker()
 
     assert logger.level == logging.NOTSET
     assert not hasattr(worker, "api_client")
     mocker.patch.object(sys, "argv", ["worker"])
     monkeypatch.setenv("ARKINDEX_DEBUG", True)
-
+    worker.args = worker.parser.parse_args()
     worker.configure()
     assert logger.level == logging.DEBUG
     assert worker.api_client
@@ -137,7 +136,8 @@ def test_configure_dev_mode(mocker, monkeypatch):
     monkeypatch.setenv(
         "ARKINDEX_WORKER_RUN_ID", "aaaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa"
     )
-    worker.configure()
+    worker.args = worker.parser.parse_args()
+    worker.configure_for_developers()
 
     assert worker.args.dev is True
     assert worker.process_information is None
@@ -162,6 +162,7 @@ def test_configure_worker_run(mocker, monkeypatch, responses, mock_config_api):
         f"http://testserver/api/v1/workers/configurations/{configuration_id}/",
         json={"id": configuration_id, "name": "BBB", "configuration": {"a": "b"}},
     )
+    worker.args = worker.parser.parse_args()
     worker.configure()
 
     assert worker.user_configuration == {"a": "b"}
@@ -183,6 +184,7 @@ def test_configure_user_configuration_defaults(
         f"http://testserver/api/v1/imports/workers/{run_id}/",
         json={"id": run_id},
     )
+    worker.args = worker.parser.parse_args()
     worker.configure()
 
     assert worker.config == {"param_1": "/some/path/file.pth", "param_2": 12}
@@ -194,7 +196,7 @@ def test_configure_user_configuration_defaults(
 
 @pytest.mark.parametrize("debug_dict", [{"debug": True}, {"debug": False}])
 def test_configure_user_config_debug(
-    mocker, monkeypatch, responses, mock_config_api, debug_dict
+    mocker, monkeypatch, responses, debug_dict, mock_config_api
 ):
     worker = BaseWorker()
     mocker.patch.object(sys, "argv", ["worker"])
@@ -212,6 +214,7 @@ def test_configure_user_config_debug(
         f"http://testserver/api/v1/workers/configurations/{configuration_id}/",
         json={"id": configuration_id, "name": "BBB", "configuration": debug_dict},
     )
+    worker.args = worker.parser.parse_args()
     worker.configure()
 
     assert worker.user_configuration == debug_dict
@@ -238,6 +241,7 @@ def test_configure_worker_run_missing_conf(
         f"http://testserver/api/v1/workers/configurations/{configuration_id}/",
         json={"id": configuration_id, "name": "BBB"},
     )
+    worker.args = worker.parser.parse_args()
     worker.configure()
 
     assert worker.user_configuration is None

tests/test_merge.py

@@ -181,6 +181,7 @@ def test_merge_from_worker(
     monkeypatch.setenv("PONOS_DATA", str(tmpdir))
     # Create the task's output dir, so that it can create its own database
     (tmpdir / "my_task").mkdir()
+    mock_base_worker_with_cache.args = mock_base_worker_with_cache.parser.parse_args()
     mock_base_worker_with_cache.configure()
     mock_base_worker_with_cache.configure_cache()