Skip to content

Commit 37b1454

Browse files
committed
updates and req change
1 parent 3de0919 commit 37b1454

4 files changed

Lines changed: 21 additions & 53 deletions

File tree

tests/files/org/openml/test/api/v1/xml/task/1/body.bin

Lines changed: 0 additions & 39 deletions
This file was deleted.

tests/files/org/openml/test/api/v1/xml/task/1/headers.json

Lines changed: 0 additions & 1 deletion
This file was deleted.

tests/files/org/openml/test/api/v1/xml/task/1/meta.json

Lines changed: 0 additions & 1 deletion
This file was deleted.

tests/test_tasks/test_task_functions.py

Lines changed: 21 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
from unittest import mock
77

88
import pytest
9+
import requests
910

1011
import openml
1112
from openml import OpenMLTask
@@ -140,7 +141,7 @@ def test_get_task_lazy(self):
140141
os.path.join(self.workdir, "org", "openml", "test", "tasks", "2", "datasplits.arff")
141142
)
142143

143-
@mock.patch("openml._api.clients.http.HTTPClient.delete")
144+
@mock.patch.object(requests.Session, "request")
144145
def test_delete_task_not_owned(mock_delete):
145146
openml.config.start_using_configuration_for_example()
146147
mock_delete.side_effect = OpenMLNotAuthorizedError(
@@ -152,10 +153,13 @@ def test_delete_task_not_owned(mock_delete):
152153
):
153154
openml.tasks.delete_task(1)
154155

155-
task_url = "task/1"
156-
assert task_url == mock_delete.call_args.args[0]
156+
print(mock_delete.call_args.kwargs)
157+
158+
task_url = "https://test.openml.org/api/v1/xml/task/1"
159+
assert task_url == mock_delete.call_args.kwargs.get("url")
160+
assert 'DELETE' == mock_delete.call_args.kwargs.get("method")
157161

158-
@mock.patch("openml._api.clients.http.HTTPClient.delete")
162+
@mock.patch.object(requests.Session, "request")
159163
def test_delete_task_with_run(mock_delete):
160164
openml.config.start_using_configuration_for_example()
161165
mock_delete.side_effect = OpenMLServerException("Task does not exist")
@@ -166,11 +170,13 @@ def test_delete_task_with_run(mock_delete):
166170
):
167171
openml.tasks.delete_task(3496)
168172

169-
task_url = "task/3496"
170-
assert task_url == mock_delete.call_args.args[0]
173+
task_url = "https://test.openml.org/api/v1/xml/task/3496"
174+
assert task_url == mock_delete.call_args.kwargs.get("url")
175+
assert 'DELETE' == mock_delete.call_args.kwargs.get("method")
171176

172-
@mock.patch("openml._api.clients.http.HTTPClient.delete")
177+
@mock.patch.object(requests.Session, "request")
173178
def test_delete_success(mock_delete, test_files_directory):
179+
openml.config.start_using_configuration_for_example()
174180
content_file = test_files_directory / "mock_responses" / "tasks" / "task_delete_successful.xml"
175181
mock_delete.return_value = create_request_response(
176182
status_code=200,
@@ -180,14 +186,17 @@ def test_delete_success(mock_delete, test_files_directory):
180186
success = openml.tasks.delete_task(361323)
181187
assert success
182188

183-
task_url = "task/361323"
184-
assert task_url == mock_delete.call_args.args[0]
189+
task_url = "https://test.openml.org/api/v1/xml/task/361323"
190+
assert task_url == mock_delete.call_args.kwargs.get("url")
191+
assert 'DELETE' == mock_delete.call_args.kwargs.get("method")
185192

186-
@mock.patch("openml._api.clients.http.HTTPClient.delete")
193+
@mock.patch.object(requests.Session, "request")
187194
def test_delete_unknown_task(mock_delete):
195+
openml.config.start_using_configuration_for_example()
188196
mock_delete.side_effect = OpenMLServerException("Task does not exist")
189197
with pytest.raises(OpenMLServerException, match="Task does not exist"):
190198
openml.tasks.delete_task(9_999_999)
191199

192-
task_url = "task/9999999"
193-
assert task_url == mock_delete.call_args.args[0]
200+
task_url = "https://test.openml.org/api/v1/xml/task/9999999"
201+
assert task_url == mock_delete.call_args.kwargs.get("url")
202+
assert 'DELETE' == mock_delete.call_args.kwargs.get("method")

0 commit comments

Comments
 (0)