Skip to content

Commit

Permalink
Drop PyPI mock test dependency (#2190)
Browse files Browse the repository at this point in the history
The functionality is in the standard library as unittest.mock
beginning with Python 3.3.

Since #2195 removed
support for everything below Python 3.6, the dependency can be removed
unconditionally.
  • Loading branch information
musicinmybrain committed Jan 14, 2022
1 parent a156dac commit dcf1e78
Show file tree
Hide file tree
Showing 12 changed files with 12 additions and 13 deletions.
2 changes: 1 addition & 1 deletion test/unit/module/cfn_json/test_cfn_json.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"""
from test.testlib.testcase import BaseTestCase
from six import StringIO
from mock import patch
from unittest.mock import patch
from cfnlint.template import Template # pylint: disable=E0401
from cfnlint.rules import RulesCollection
from cfnlint.core import DEFAULT_RULESDIR # pylint: disable=E0401
Expand Down
2 changes: 1 addition & 1 deletion test/unit/module/cfn_yaml/test_yaml.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"""
from test.testlib.testcase import BaseTestCase
from six import StringIO
from mock import patch
from unittest.mock import patch
from cfnlint.template import Template # pylint: disable=E0401
from cfnlint.rules import RulesCollection
from cfnlint.core import DEFAULT_RULESDIR # pylint: disable=E0401
Expand Down
2 changes: 1 addition & 1 deletion test/unit/module/config/test_config_file_args.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
import logging
from test.testlib.testcase import BaseTestCase
import jsonschema
from mock import patch
from unittest.mock import patch
import cfnlint.config # pylint: disable=E0401
try: # pragma: no cover
from pathlib import Path
Expand Down
2 changes: 1 addition & 1 deletion test/unit/module/config/test_config_mixin.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
import logging
import os
from test.testlib.testcase import BaseTestCase
from mock import patch
from unittest.mock import patch
import cfnlint.config # pylint: disable=E0401
from cfnlint.helpers import REGIONS

Expand Down
2 changes: 1 addition & 1 deletion test/unit/module/core/test_run_cli.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
from six import StringIO
import cfnlint.core # pylint: disable=E0401
import cfnlint.config # pylint: disable=E0401
from mock import patch
from unittest.mock import patch


LOGGER = logging.getLogger('cfnlint')
Expand Down
2 changes: 1 addition & 1 deletion test/unit/module/custom_rules/test_custom_rules.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"""
from test.testlib.testcase import BaseTestCase
from six import StringIO
from mock import patch
from unittest.mock import patch
from cfnlint.template import Template # pylint: disable=E0401
from cfnlint.rules import RulesCollection
from cfnlint.core import DEFAULT_RULESDIR # pylint: disable=E0401
Expand Down
2 changes: 1 addition & 1 deletion test/unit/module/helpers/test_downloads_metadata.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
import sys
import os
from test.testlib.testcase import BaseTestCase
from mock import patch, MagicMock, mock_open
from unittest.mock import patch, MagicMock, mock_open
import cfnlint.helpers
import json

Expand Down
4 changes: 2 additions & 2 deletions test/unit/module/helpers/test_get_url_content.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
except:
pass
from test.testlib.testcase import BaseTestCase
from mock import patch, MagicMock
from unittest.mock import patch, MagicMock
import cfnlint.helpers


Expand Down Expand Up @@ -146,4 +146,4 @@ def test_url_has_newer_version_negative(self, mock_load_metadata, mocked_urlopen
mocked_urlopen.return_value = cm

result = cfnlint.helpers.url_has_newer_version(url)
self.assertTrue(result)
self.assertTrue(result)
2 changes: 1 addition & 1 deletion test/unit/module/maintenance/test_update_documentation.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
import sys
import logging
from test.testlib.testcase import BaseTestCase
from mock import patch, mock_open, call
from unittest.mock import patch, mock_open, call
import cfnlint.maintenance
from cfnlint.rules import CloudFormationLintRule, RulesCollection

Expand Down
2 changes: 1 addition & 1 deletion test/unit/module/maintenance/test_update_iam_policies.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
import sys
import logging
from test.testlib.testcase import BaseTestCase
from mock import patch
from unittest.mock import patch
import cfnlint.maintenance

LOGGER = logging.getLogger('cfnlint.maintenance')
Expand Down
2 changes: 1 addition & 1 deletion test/unit/module/maintenance/test_update_resource_specs.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
import logging
import zipfile
from test.testlib.testcase import BaseTestCase
from mock import patch, MagicMock, Mock, ANY
from unittest.mock import patch, MagicMock, Mock, ANY
import cfnlint.maintenance
try:
from urllib.request import urlopen, Request
Expand Down
1 change: 0 additions & 1 deletion tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ commands =
coverage xml
skip_install = True
deps =
mock
coverage
pydot
setenv =
Expand Down

0 comments on commit dcf1e78

Please sign in to comment.