From 44498d88658c75ae44b74579f66953f5b4cbe829 Mon Sep 17 00:00:00 2001 From: Daniel Bast <2790401+dbast@users.noreply.github.com> Date: Sat, 16 Sep 2023 09:24:14 +0200 Subject: [PATCH] Use mock from Python stdlib and upgrade test requirements versions mock is part of the Python standard lib since Python 3.3, see also https://docs.python.org/3/library/unittest.mock.html. Switching to that allows to remove it from `test/requirements.txt`. While at it, also updating the package versions in `test/requirements.txt`. --- tests/base.py | 2 +- tests/requirements.txt | 5 ++--- tests/screenshot_generator/generator.py | 2 +- tests/test_bip85.py | 2 +- tests/test_flows_settings.py | 2 +- tests/test_flows_view.py | 2 +- 6 files changed, 7 insertions(+), 8 deletions(-) diff --git a/tests/base.py b/tests/base.py index 496e1b86..e7bb2ddf 100644 --- a/tests/base.py +++ b/tests/base.py @@ -1,6 +1,6 @@ import sys from dataclasses import dataclass -from mock import MagicMock, Mock, patch +from unittest.mock import MagicMock, Mock, patch from typing import Callable # Prevent importing modules w/Raspi hardware dependencies. diff --git a/tests/requirements.txt b/tests/requirements.txt index a66aac6b..d42adea7 100644 --- a/tests/requirements.txt +++ b/tests/requirements.txt @@ -1,4 +1,3 @@ -coverage==7.2.1 -mock==4.0.3 -pytest==6.2.4 +coverage==7.3.1 +pytest==7.4.2 pytest-cov==4.1.0 diff --git a/tests/screenshot_generator/generator.py b/tests/screenshot_generator/generator.py index 83a58135..a2ce87c5 100644 --- a/tests/screenshot_generator/generator.py +++ b/tests/screenshot_generator/generator.py @@ -2,7 +2,7 @@ import embit import os import sys import time -from mock import Mock, patch, MagicMock +from unittest.mock import Mock, patch, MagicMock from seedsigner.helpers import embit_utils from seedsigner.models.settings import Settings diff --git a/tests/test_bip85.py b/tests/test_bip85.py index 5ade3917..737be569 100644 --- a/tests/test_bip85.py +++ b/tests/test_bip85.py @@ -1,5 +1,5 @@ import pytest -from mock import MagicMock +from unittest.mock import MagicMock from seedsigner.models.seed import Seed from embit import bip39 diff --git a/tests/test_flows_settings.py b/tests/test_flows_settings.py index a6eb34d9..c449f679 100644 --- a/tests/test_flows_settings.py +++ b/tests/test_flows_settings.py @@ -1,7 +1,7 @@ import os from typing import Callable -from mock import PropertyMock, patch +from unittest.mock import PropertyMock, patch # Must import test base before the Controller from base import FlowTest, FlowStep diff --git a/tests/test_flows_view.py b/tests/test_flows_view.py index 6d032460..695ee093 100644 --- a/tests/test_flows_view.py +++ b/tests/test_flows_view.py @@ -1,4 +1,4 @@ -from mock import patch +from unittest.mock import patch # Must import test base before the Controller from base import FlowTest, FlowStep