Skip to content

Commit 176002c

Browse files
committed
modified tests
1 parent 4f6e7ec commit 176002c

2 files changed

Lines changed: 13 additions & 10 deletions

File tree

tests/test_api/test_run.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ def test_run_v1_list(run_v1):
4747
assert "flow_id" in runs_df.columns
4848

4949

50-
def test_run_v1_publish_mocked(run_v1, use_api_v1, test_api_key):
50+
def test_run_v1_publish_mocked(run_v1, test_apikey_v1):
5151
files = {"description": "<run/>"}
5252

5353
with patch.object(Session, "request") as mock_request:
@@ -66,13 +66,13 @@ def test_run_v1_publish_mocked(run_v1, use_api_v1, test_api_key):
6666
method="POST",
6767
url=openml.config.server + "run",
6868
params={},
69-
data={"api_key": test_api_key},
69+
data={"api_key": test_apikey_v1},
7070
headers=openml.config._HEADERS,
7171
files=files,
7272
)
7373

7474

75-
def test_run_v1_delete_mocked(run_v1, use_api_v1, test_api_key):
75+
def test_run_v1_delete_mocked(run_v1, test_apikey_v1):
7676
run_id = 456
7777

7878
with patch.object(Session, "request") as mock_request:
@@ -90,7 +90,7 @@ def test_run_v1_delete_mocked(run_v1, use_api_v1, test_api_key):
9090
mock_request.assert_called_once_with(
9191
method="DELETE",
9292
url=openml.config.server + f"run/{run_id}",
93-
params={"api_key": test_api_key},
93+
params={"api_key": test_apikey_v1},
9494
data={},
9595
headers=openml.config._HEADERS,
9696
files=None,

tests/test_runs/test_run_functions.py

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1802,7 +1802,7 @@ def test_initialize_model_from_run_nonstrict(self):
18021802
_ = openml.runs.initialize_model_from_run(run_id=1, strict_version=False)
18031803

18041804

1805-
@mock.patch.object(requests.Session, "delete")
1805+
@mock.patch.object(requests.Session, "request")
18061806
def test_delete_run_not_owned(mock_delete, test_files_directory, test_server_v1, test_apikey_v1):
18071807
content_file = test_files_directory / "mock_responses" / "runs" / "run_delete_not_owned.xml"
18081808
mock_delete.return_value = create_request_response(
@@ -1817,11 +1817,12 @@ def test_delete_run_not_owned(mock_delete, test_files_directory, test_server_v1,
18171817
openml.runs.delete_run(40_000)
18181818

18191819
run_url = test_server_v1 + "run/40000"
1820-
assert run_url == mock_delete.call_args.args[0]
1820+
assert run_url == mock_delete.call_args.kwargs.get("url")
1821+
assert "DELETE" == mock_delete.call_args.kwargs.get("method")
18211822
assert test_apikey_v1 == mock_delete.call_args.kwargs.get("params", {}).get("api_key")
18221823

18231824

1824-
@mock.patch.object(requests.Session, "delete")
1825+
@mock.patch.object(requests.Session, "request")
18251826
def test_delete_run_success(mock_delete, test_files_directory, test_server_v1, test_apikey_v1):
18261827
content_file = test_files_directory / "mock_responses" / "runs" / "run_delete_successful.xml"
18271828
mock_delete.return_value = create_request_response(
@@ -1833,11 +1834,12 @@ def test_delete_run_success(mock_delete, test_files_directory, test_server_v1, t
18331834
assert success
18341835

18351836
run_url = test_server_v1 + "run/10591880"
1836-
assert run_url == mock_delete.call_args.args[0]
1837+
assert run_url == mock_delete.call_args.kwargs.get("url")
1838+
assert "DELETE" == mock_delete.call_args.kwargs.get("method")
18371839
assert test_apikey_v1 == mock_delete.call_args.kwargs.get("params", {}).get("api_key")
18381840

18391841

1840-
@mock.patch.object(requests.Session, "delete")
1842+
@mock.patch.object(requests.Session, "request")
18411843
def test_delete_unknown_run(mock_delete, test_files_directory, test_server_v1, test_apikey_v1):
18421844
content_file = test_files_directory / "mock_responses" / "runs" / "run_delete_not_exist.xml"
18431845
mock_delete.return_value = create_request_response(
@@ -1852,7 +1854,8 @@ def test_delete_unknown_run(mock_delete, test_files_directory, test_server_v1, t
18521854
openml.runs.delete_run(9_999_999)
18531855

18541856
run_url = test_server_v1 + "run/9999999"
1855-
assert run_url == mock_delete.call_args.args[0]
1857+
assert run_url == mock_delete.call_args.kwargs.get("url")
1858+
assert "DELETE" == mock_delete.call_args.kwargs.get("method")
18561859
assert test_apikey_v1 == mock_delete.call_args.kwargs.get("params", {}).get("api_key")
18571860

18581861

0 commit comments

Comments
 (0)