From e0acbd08a5a198b084b94b00212e08c7e1a9735b Mon Sep 17 00:00:00 2001
From: Robert Rosca <robert.rosca@xfel.eu>
Date: Wed, 11 May 2022 16:23:32 +0200
Subject: [PATCH] Remove unnecessary mocking
---
tests/test_webservice.py | 47 ++++++++++++++++++----------------------
1 file changed, 21 insertions(+), 26 deletions(-)
diff --git a/tests/test_webservice.py b/tests/test_webservice.py
index ac9a3f07b..62082c1a8 100644
--- a/tests/test_webservice.py
+++ b/tests/test_webservice.py
@@ -126,32 +126,27 @@ async def test_wait_on_transfer(
else:
run_path.symlink_to(pnfs_dir)
- with mock.patch("webservice.config.webservice") as config:
- config["correct"] = {
- "in-folder": f"{tmp_root}/{{instrument}}/{{cycle}}/p{{proposal}}/raw"
- }
-
- response = mock.Mock()
- response.status_code = 200
- response.json = lambda: {"runs": [{"repositories": {r: None for r in repositories}}]}
- client = mock.Mock()
- client.get_runs_by_proposal_number_api = mock.Mock(return_value=response)
-
- _run_path = mock.Mock(spec=run_path)
- _run_path.resolve = lambda: Path("/") / run_path.resolve().relative_to(tmp_path)
-
- try:
- await wait_on_transfer(
- client,
- run=run_no,
- proposal=str(prop_no),
- run_dir=_run_path,
- max_tries=1,
- sleep_completion=0,
- )
- except MigrationError as e:
- if not expected_error:
- raise e
+ response = mock.Mock()
+ response.status_code = 200
+ response.json = lambda: {"runs": [{"repositories": {r: None for r in repositories}}]}
+ client = mock.Mock()
+ client.get_runs_by_proposal_number_api = mock.Mock(return_value=response)
+
+ _run_path = mock.Mock(spec=run_path)
+ _run_path.resolve = lambda: Path("/") / run_path.resolve().relative_to(tmp_path)
+
+ try:
+ await wait_on_transfer(
+ client,
+ run=run_no,
+ proposal=str(prop_no),
+ run_dir=_run_path,
+ max_tries=1,
+ sleep_completion=0,
+ )
+ except MigrationError as e:
+ if not expected_error:
+ raise e
@pytest.mark.asyncio
@pytest.mark.parametrize(
--
GitLab