Skip to content

Commit ca3a88f

Browse files
authored
Drop mock module usage in favour of standard unittest.mock (#19263) (#19264)
Since Python 3.3 the mock module became part of the standard unittest library as unittest.mock. This MR removes the usage of that in favour of the standard library, simplyfing the dependency tree and uniforming usage in code.
1 parent 5ac76b6 commit ca3a88f

32 files changed

+33
-34
lines changed

conan/test/utils/tools.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@
1616
from inspect import getframeinfo, stack
1717
from urllib.parse import urlsplit, urlunsplit
1818

19-
import mock
19+
from unittest import mock
2020
import pytest
2121
import requests
22-
from mock import Mock
22+
from unittest.mock import Mock
2323
from requests.exceptions import HTTPError
2424
from webtest.app import TestApp
2525

conans/requirements_dev.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
pytest>=7, <8.0.0
22
pytest-xdist # To launch in N cores with pytest -n
33
parameterized>=0.6.3
4-
mock>=1.3.0, <1.4.0
54
WebTest>=3.0.0, <4
65
bottle
76
PyJWT

test/functional/command/test_config_install.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import textwrap
66

77
import pytest
8-
from mock import patch
8+
from unittest.mock import patch
99

1010
from conan.api.model import Remote
1111
from conan.internal.api.config.config_installer import _hide_password

test/functional/layout/test_source_folder.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
import platform
33
from shutil import copy
44

5-
import mock
5+
from unittest import mock
66
import pytest
77

88
from conan.test.assets.cmake import gen_cmakelists

test/functional/revisions_test.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
from collections import OrderedDict
55

66
import pytest
7-
from mock import patch
7+
from unittest.mock import patch
88

99
from conan.test.utils.env import environment_update
1010
from conan.internal.errors import RecipeNotFoundException

test/integration/cache/cache2_update_test.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
from collections import OrderedDict
33

44
import pytest
5-
from mock import patch
5+
from unittest.mock import patch
66

77
from conan.api.model import RecipeReference
88
from conans.server.revision_list import RevisionList

test/integration/cache/test_package_revisions.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
from mock import mock
1+
from unittest import mock
22

33
from conan.test.assets.genconanfile import GenConanfile
44
from conan.test.utils.tools import TestClient

test/integration/command/help_test.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
from mock import patch
1+
from unittest.mock import patch
22

33
from conan import __version__
44
from conan.test.utils.env import environment_update

test/integration/command/remote/test_remote_users.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
from collections import OrderedDict
55
from datetime import timedelta
66

7-
from mock import patch
7+
from unittest.mock import patch
88

99
from conan.internal.api.remotes.localdb import LocalDB
1010
from conan.test.utils.tools import TestClient, TestServer

test/integration/command/test_audit.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
from contextlib import contextmanager
66

77
import pytest
8-
from mock.mock import patch, MagicMock
8+
from unittest.mock import patch, MagicMock
99

1010
from conan.test.assets.genconanfile import GenConanfile
1111
from conan.test.utils.env import environment_update

0 commit comments

Comments
 (0)