aboutsummaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorCody Logan <cody@lokken.dev>2023-11-06 12:18:46 -0800
committerCody Logan <cody@lokken.dev>2023-11-06 12:18:46 -0800
commit3d34b09a361dadb50bb4e4ffa18c75928904c30d (patch)
tree3439106e06fedbc9c9030462971818c89c90631f /tests
parent2d18a4cefff6f26a48966e66774c463dfbbe2492 (diff)
downloadwikiget-3d34b09a361dadb50bb4e4ffa18c75928904c30d.tar.gz
wikiget-3d34b09a361dadb50bb4e4ffa18c75928904c30d.zip
Simplify mock usage in tests
Diffstat (limited to 'tests')
-rw-r--r--tests/test_client.py12
-rw-r--r--tests/test_dl.py8
2 files changed, 8 insertions, 12 deletions
diff --git a/tests/test_client.py b/tests/test_client.py
index 45739d3..207d9b2 100644
--- a/tests/test_client.py
+++ b/tests/test_client.py
@@ -16,11 +16,10 @@
# along with Wikiget. If not, see <https://www.gnu.org/licenses/>.
import logging
-from unittest.mock import MagicMock, patch
+from unittest.mock import MagicMock, patch, sentinel
import pytest
-from mwclient import InvalidResponse, Site
-from mwclient.image import Image
+from mwclient import InvalidResponse
from requests import ConnectionError, HTTPError
from wikiget import DEFAULT_SITE
@@ -113,9 +112,8 @@ class TestQueryApi:
# would have created using the MediaWiki API. The Site.images attribute is
# normally populated during Site init, but since we're not doing that, a mock
# dict is created for query_api to parse.
- mock_site = MagicMock(Site)
- mock_image = MagicMock(Image)
- mock_site.images = {"Example.jpg": mock_image}
+ mock_site = MagicMock()
+ mock_site.images = {"Example.jpg": sentinel.mock_image}
image = query_api("Example.jpg", mock_site)
- assert image == mock_image
+ assert image == sentinel.mock_image
diff --git a/tests/test_dl.py b/tests/test_dl.py
index f2a942f..08cf5b4 100644
--- a/tests/test_dl.py
+++ b/tests/test_dl.py
@@ -16,11 +16,9 @@
# along with Wikiget. If not, see <https://www.gnu.org/licenses/>.
from pathlib import Path
-from unittest.mock import MagicMock, patch
+from unittest.mock import MagicMock, Mock, patch
import pytest
-from mwclient import Site
-from mwclient.image import Image
from wikiget.dl import prep_download, process_download
from wikiget.file import File
@@ -34,8 +32,8 @@ class TestPrepDownload:
self, mock_connect_to_site: MagicMock, mock_query_api: MagicMock
) -> None:
"""The prep_download function should create the expected file object."""
- mock_site = MagicMock(Site)
- mock_image = MagicMock(Image)
+ mock_site = Mock()
+ mock_image = Mock()
mock_connect_to_site.return_value = mock_site
mock_query_api.return_value = mock_image