diff --git a/test-requirements.txt b/test-requirements.txt index 0732db93e..3bc2e9665 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -4,7 +4,6 @@ coverage>=4.5.4 # Apache-2.0 fixtures>=3.0.0 # Apache-2.0/BSD hacking>=2.0.0 # Apache-2.0 -mock>=3.0.5 # BSD stestr>=2.5.0 # Apache-2.0 testscenarios>=0.5.0 # Apache-2.0/BSD testtools>=2.3.0 # MIT diff --git a/tests/unit/cli/test_baseline.py b/tests/unit/cli/test_baseline.py index 0c58bb80c..245d711d2 100644 --- a/tests/unit/cli/test_baseline.py +++ b/tests/unit/cli/test_baseline.py @@ -6,10 +6,10 @@ import os import subprocess +from unittest import mock import fixtures import git -import mock import testtools import bandit.cli.baseline as baseline diff --git a/tests/unit/cli/test_config_generator.py b/tests/unit/cli/test_config_generator.py index 6e540716c..a7946c964 100644 --- a/tests/unit/cli/test_config_generator.py +++ b/tests/unit/cli/test_config_generator.py @@ -6,8 +6,8 @@ import importlib import logging +from unittest import mock -import mock import testtools import yaml diff --git a/tests/unit/cli/test_main.py b/tests/unit/cli/test_main.py index 815e3c118..b191699b6 100644 --- a/tests/unit/cli/test_main.py +++ b/tests/unit/cli/test_main.py @@ -4,9 +4,9 @@ import logging import os +from unittest import mock import fixtures -import mock import testtools from bandit.cli import main as bandit diff --git a/tests/unit/core/test_config.py b/tests/unit/core/test_config.py index 9e028ad47..6a2e4e834 100644 --- a/tests/unit/core/test_config.py +++ b/tests/unit/core/test_config.py @@ -5,10 +5,10 @@ import os import tempfile import textwrap +from unittest import mock import uuid import fixtures -import mock import testtools from bandit.core import config diff --git a/tests/unit/core/test_context.py b/tests/unit/core/test_context.py index afa1e02b0..c910c9f34 100644 --- a/tests/unit/core/test_context.py +++ b/tests/unit/core/test_context.py @@ -5,8 +5,8 @@ # SPDX-License-Identifier: Apache-2.0 import ast +from unittest import mock -import mock import testtools from bandit.core import context diff --git a/tests/unit/core/test_issue.py b/tests/unit/core/test_issue.py index c025ae7de..da520f55c 100644 --- a/tests/unit/core/test_issue.py +++ b/tests/unit/core/test_issue.py @@ -4,7 +4,8 @@ # # SPDX-License-Identifier: Apache-2.0 -import mock +from unittest import mock + import testtools import bandit diff --git a/tests/unit/core/test_manager.py b/tests/unit/core/test_manager.py index 0ee928e0e..c5a3b9a37 100644 --- a/tests/unit/core/test_manager.py +++ b/tests/unit/core/test_manager.py @@ -5,9 +5,9 @@ # SPDX-License-Identifier: Apache-2.0 import os +from unittest import mock import fixtures -import mock import testtools from bandit.core import config diff --git a/tests/unit/core/test_test_set.py b/tests/unit/core/test_test_set.py index 280d112da..861d099a4 100644 --- a/tests/unit/core/test_test_set.py +++ b/tests/unit/core/test_test_set.py @@ -4,7 +4,8 @@ # # SPDX-License-Identifier: Apache-2.0 -import mock +from unittest import mock + from stevedore import extension import testtools diff --git a/tests/unit/formatters/test_html.py b/tests/unit/formatters/test_html.py index 06edd76f0..9d2c297c3 100644 --- a/tests/unit/formatters/test_html.py +++ b/tests/unit/formatters/test_html.py @@ -5,9 +5,9 @@ import collections import tempfile +from unittest import mock import bs4 -import mock import testtools import bandit diff --git a/tests/unit/formatters/test_json.py b/tests/unit/formatters/test_json.py index 37077e289..392ce2142 100644 --- a/tests/unit/formatters/test_json.py +++ b/tests/unit/formatters/test_json.py @@ -5,8 +5,8 @@ import collections import json import tempfile +from unittest import mock -import mock import testtools import bandit diff --git a/tests/unit/formatters/test_screen.py b/tests/unit/formatters/test_screen.py index 533abbd16..18bf2b8b5 100644 --- a/tests/unit/formatters/test_screen.py +++ b/tests/unit/formatters/test_screen.py @@ -5,8 +5,8 @@ import collections import tempfile +from unittest import mock -import mock import testtools import bandit diff --git a/tests/unit/formatters/test_text.py b/tests/unit/formatters/test_text.py index f31051b5b..30a45af0e 100644 --- a/tests/unit/formatters/test_text.py +++ b/tests/unit/formatters/test_text.py @@ -5,8 +5,8 @@ import collections import tempfile +from unittest import mock -import mock import testtools import bandit diff --git a/tests/unit/formatters/test_yaml.py b/tests/unit/formatters/test_yaml.py index de204ec1f..aad57c63d 100644 --- a/tests/unit/formatters/test_yaml.py +++ b/tests/unit/formatters/test_yaml.py @@ -4,8 +4,8 @@ import collections import tempfile +from unittest import mock -import mock import testtools import yaml