diff --git a/requirements/dev.txt b/requirements/dev.txt index 7a9acc064..4f95712ab 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -7,7 +7,6 @@ isort>=4.2.5,<5; python_version < '3.8' # Test requirements pytest>=6.1.1 -mock==4.0.2 parameterized==0.7.4 pyelftools~=0.29 # Used to verify the generated Go binary architecture in integration tests (utils.py) diff --git a/tests/functional/test_utils.py b/tests/functional/test_utils.py index a89790f95..81e07c42e 100644 --- a/tests/functional/test_utils.py +++ b/tests/functional/test_utils.py @@ -78,7 +78,7 @@ def test_raise_exception_for_unsafe_tarfile(self): tar_filename = "path_reversal_win.tgz" if platform.system().lower() == "windows" else "path_reversal_uxix.tgz" test_tar = os.path.join(os.path.dirname(__file__), "testdata", tar_filename) test_dir = tempfile.mkdtemp() - self.assertRaisesRegexp( + self.assertRaisesRegex( ExtractError, "Attempted Path Traversal in Tar File", extract_tarfile, test_tar, test_dir ) diff --git a/tests/functional/workflows/python_pip/test_packager.py b/tests/functional/workflows/python_pip/test_packager.py index ed0ae4fb7..0cfa0ccc9 100644 --- a/tests/functional/workflows/python_pip/test_packager.py +++ b/tests/functional/workflows/python_pip/test_packager.py @@ -4,9 +4,9 @@ import tarfile import io from collections import defaultdict, namedtuple +from unittest import mock import pytest -import mock from aws_lambda_builders.architecture import ARM64 from aws_lambda_builders.workflows.python_pip.packager import PipRunner, UnsupportedPackageError diff --git a/tests/integration/workflows/nodejs_npm/test_nodejs_npm.py b/tests/integration/workflows/nodejs_npm/test_nodejs_npm.py index 5f41a404b..67d9b3894 100644 --- a/tests/integration/workflows/nodejs_npm/test_nodejs_npm.py +++ b/tests/integration/workflows/nodejs_npm/test_nodejs_npm.py @@ -3,9 +3,8 @@ import shutil import tempfile -from unittest import TestCase +from unittest import TestCase, mock -import mock from parameterized import parameterized from aws_lambda_builders.builder import LambdaBuilder diff --git a/tests/integration/workflows/python_pip/test_python_pip.py b/tests/integration/workflows/python_pip/test_python_pip.py index 705cb676a..d11d7f331 100644 --- a/tests/integration/workflows/python_pip/test_python_pip.py +++ b/tests/integration/workflows/python_pip/test_python_pip.py @@ -4,8 +4,8 @@ import sys import platform import tempfile -from unittest import TestCase, skipIf -import mock +from unittest import TestCase, skipIf, mock + from parameterized import parameterized_class from aws_lambda_builders.builder import LambdaBuilder diff --git a/tests/integration/workflows/ruby_bundler/test_ruby.py b/tests/integration/workflows/ruby_bundler/test_ruby.py index 282228676..9648cd6b6 100644 --- a/tests/integration/workflows/ruby_bundler/test_ruby.py +++ b/tests/integration/workflows/ruby_bundler/test_ruby.py @@ -2,12 +2,11 @@ import shutil import tempfile -from unittest import TestCase +from unittest import TestCase, mock from aws_lambda_builders.builder import LambdaBuilder from aws_lambda_builders.exceptions import WorkflowFailedError -import mock import logging logger = logging.getLogger("aws_lambda_builders.workflows.ruby_bundler.bundler") diff --git a/tests/unit/test_actions.py b/tests/unit/test_actions.py index a2e475344..f390b81e6 100644 --- a/tests/unit/test_actions.py +++ b/tests/unit/test_actions.py @@ -1,7 +1,7 @@ from pathlib import Path -from typing import List, Tuple from unittest import TestCase -from mock import patch, ANY, Mock +from unittest.mock import ANY, patch + from parameterized import parameterized from aws_lambda_builders.actions import ( diff --git a/tests/unit/test_builder.py b/tests/unit/test_builder.py index 77bfb73ef..b6ed80876 100644 --- a/tests/unit/test_builder.py +++ b/tests/unit/test_builder.py @@ -1,7 +1,8 @@ import itertools from unittest import TestCase -from mock import patch, call, Mock -from parameterized import parameterized, param +from unittest.mock import patch, call, Mock + +from parameterized import parameterized from aws_lambda_builders.builder import LambdaBuilder from aws_lambda_builders.workflow import BuildDirectory, BuildInSourceSupport, Capability, BaseWorkflow diff --git a/tests/unit/test_path_resolver.py b/tests/unit/test_path_resolver.py index b576af7e4..f0a65042a 100644 --- a/tests/unit/test_path_resolver.py +++ b/tests/unit/test_path_resolver.py @@ -1,7 +1,8 @@ from unittest import TestCase +from unittest.mock import patch + import os -import mock from aws_lambda_builders import utils from aws_lambda_builders.path_resolver import PathResolver @@ -22,6 +23,6 @@ def test_which_fails(self): self.path_resolver._which() def test_which_success_immediate(self): - with mock.patch.object(self.path_resolver, "_which") as which_mock: + with patch.object(self.path_resolver, "_which") as which_mock: which_mock.return_value = os.getcwd() self.assertEqual(self.path_resolver.exec_paths, os.getcwd()) diff --git a/tests/unit/test_registry.py b/tests/unit/test_registry.py index d1e0f70cd..59a2e60c2 100644 --- a/tests/unit/test_registry.py +++ b/tests/unit/test_registry.py @@ -1,5 +1,6 @@ from unittest import TestCase -from mock import Mock, call +from unittest.mock import Mock, call + from parameterized import parameterized from aws_lambda_builders.registry import Registry, DEFAULT_REGISTRY, get_workflow diff --git a/tests/unit/test_workflow.py b/tests/unit/test_workflow.py index 878387b6e..2058987ce 100644 --- a/tests/unit/test_workflow.py +++ b/tests/unit/test_workflow.py @@ -1,14 +1,11 @@ import os import sys from unittest import TestCase -from parameterized import parameterized +from unittest.mock import Mock, MagicMock, call -from mock import Mock, MagicMock, call +from parameterized import parameterized -try: - import pathlib -except ImportError: - import pathlib2 as pathlib +import pathlib from aws_lambda_builders.binary_path import BinaryPath from aws_lambda_builders.validator import RuntimeValidator diff --git a/tests/unit/workflows/custom_make/test_actions.py b/tests/unit/workflows/custom_make/test_actions.py index aede6f1ab..2b9173c09 100644 --- a/tests/unit/workflows/custom_make/test_actions.py +++ b/tests/unit/workflows/custom_make/test_actions.py @@ -1,8 +1,7 @@ import os from unittest import TestCase - -from mock import patch, ANY +from unittest.mock import patch, ANY from aws_lambda_builders.actions import ActionFailedError from aws_lambda_builders.workflows.custom_make.utils import OSUtils diff --git a/tests/unit/workflows/custom_make/test_make.py b/tests/unit/workflows/custom_make/test_make.py index 0696725d9..5aa8f16ba 100644 --- a/tests/unit/workflows/custom_make/test_make.py +++ b/tests/unit/workflows/custom_make/test_make.py @@ -1,6 +1,6 @@ import io from unittest import TestCase -from mock import patch +from unittest.mock import patch from aws_lambda_builders.workflows.custom_make.make import MakeExecutionError, SubProcessMake diff --git a/tests/unit/workflows/custom_make/test_workflow.py b/tests/unit/workflows/custom_make/test_workflow.py index 028ef2945..2f1239396 100644 --- a/tests/unit/workflows/custom_make/test_workflow.py +++ b/tests/unit/workflows/custom_make/test_workflow.py @@ -1,7 +1,6 @@ from unittest import TestCase -from unittest.mock import patch -from aws_lambda_builders.architecture import X86_64, ARM64 +from aws_lambda_builders.architecture import ARM64 from aws_lambda_builders.actions import CopySourceAction from aws_lambda_builders.exceptions import WorkflowFailedError from aws_lambda_builders.workflows.custom_make.workflow import CustomMakeWorkflow diff --git a/tests/unit/workflows/dotnet_clipackage/test_actions.py b/tests/unit/workflows/dotnet_clipackage/test_actions.py index 4b27d9b21..34045d8cb 100644 --- a/tests/unit/workflows/dotnet_clipackage/test_actions.py +++ b/tests/unit/workflows/dotnet_clipackage/test_actions.py @@ -3,7 +3,7 @@ import os import platform from concurrent.futures import ThreadPoolExecutor -from mock import patch +from unittest.mock import patch from aws_lambda_builders.actions import ActionFailedError from aws_lambda_builders.architecture import ARM64, X86_64 diff --git a/tests/unit/workflows/dotnet_clipackage/test_dotnetcli.py b/tests/unit/workflows/dotnet_clipackage/test_dotnetcli.py index 7d014bc63..32f7a7eea 100644 --- a/tests/unit/workflows/dotnet_clipackage/test_dotnetcli.py +++ b/tests/unit/workflows/dotnet_clipackage/test_dotnetcli.py @@ -1,5 +1,5 @@ from unittest import TestCase -from mock import patch, MagicMock +from unittest.mock import patch, MagicMock from aws_lambda_builders.workflows.dotnet_clipackage.dotnetcli import SubprocessDotnetCLI, DotnetCLIExecutionError diff --git a/tests/unit/workflows/dotnet_clipackage/test_dotnetcli_resolver.py b/tests/unit/workflows/dotnet_clipackage/test_dotnetcli_resolver.py index 4d2b14a3f..39e48d5ee 100644 --- a/tests/unit/workflows/dotnet_clipackage/test_dotnetcli_resolver.py +++ b/tests/unit/workflows/dotnet_clipackage/test_dotnetcli_resolver.py @@ -1,5 +1,5 @@ from unittest import TestCase -from mock import patch +from unittest.mock import patch from aws_lambda_builders.workflows.dotnet_clipackage.dotnetcli_resolver import DotnetCliResolver diff --git a/tests/unit/workflows/dotnet_clipackage/test_workflow.py b/tests/unit/workflows/dotnet_clipackage/test_workflow.py index c3cb9a9f3..b54f1593c 100644 --- a/tests/unit/workflows/dotnet_clipackage/test_workflow.py +++ b/tests/unit/workflows/dotnet_clipackage/test_workflow.py @@ -1,6 +1,6 @@ from unittest import TestCase -from aws_lambda_builders.architecture import ARM64, X86_64 +from aws_lambda_builders.architecture import ARM64 from aws_lambda_builders.workflows.dotnet_clipackage.workflow import DotnetCliPackageWorkflow from aws_lambda_builders.workflows.dotnet_clipackage.actions import GlobalToolInstallAction, RunPackageAction diff --git a/tests/unit/workflows/go_modules/test_actions.py b/tests/unit/workflows/go_modules/test_actions.py index b126442c6..2aa056750 100644 --- a/tests/unit/workflows/go_modules/test_actions.py +++ b/tests/unit/workflows/go_modules/test_actions.py @@ -1,5 +1,5 @@ from unittest import TestCase -from mock import patch +from unittest.mock import patch from aws_lambda_builders.actions import ActionFailedError from aws_lambda_builders.workflows.go_modules.actions import GoModulesBuildAction diff --git a/tests/unit/workflows/go_modules/test_builder.py b/tests/unit/workflows/go_modules/test_builder.py index 6af448030..b723d5dff 100644 --- a/tests/unit/workflows/go_modules/test_builder.py +++ b/tests/unit/workflows/go_modules/test_builder.py @@ -1,6 +1,6 @@ from unittest import TestCase -from mock import patch, Mock +from unittest.mock import patch, Mock from pathlib import Path from aws_lambda_builders.binary_path import BinaryPath diff --git a/tests/unit/workflows/go_modules/test_validator.py b/tests/unit/workflows/go_modules/test_validator.py index 14acd8698..2d88fed3d 100644 --- a/tests/unit/workflows/go_modules/test_validator.py +++ b/tests/unit/workflows/go_modules/test_validator.py @@ -1,6 +1,5 @@ -from unittest import TestCase +from unittest import TestCase, mock -import mock from parameterized import parameterized from aws_lambda_builders.exceptions import MisMatchRuntimeError diff --git a/tests/unit/workflows/java/test_actions.py b/tests/unit/workflows/java/test_actions.py index 9b0acd05e..c6f48deb7 100644 --- a/tests/unit/workflows/java/test_actions.py +++ b/tests/unit/workflows/java/test_actions.py @@ -1,5 +1,5 @@ from unittest import TestCase -from mock import patch +from unittest.mock import patch import os from aws_lambda_builders.actions import ActionFailedError diff --git a/tests/unit/workflows/java_gradle/test_actions.py b/tests/unit/workflows/java_gradle/test_actions.py index 01a2be459..8ccbfed42 100644 --- a/tests/unit/workflows/java_gradle/test_actions.py +++ b/tests/unit/workflows/java_gradle/test_actions.py @@ -1,5 +1,5 @@ from unittest import TestCase -from mock import patch, call +from unittest.mock import patch, call import os from aws_lambda_builders.actions import ActionFailedError diff --git a/tests/unit/workflows/java_gradle/test_gradle.py b/tests/unit/workflows/java_gradle/test_gradle.py index 378443c39..ef72e28c5 100644 --- a/tests/unit/workflows/java_gradle/test_gradle.py +++ b/tests/unit/workflows/java_gradle/test_gradle.py @@ -1,7 +1,7 @@ import subprocess from unittest import TestCase -from mock import patch +from unittest.mock import patch from aws_lambda_builders.binary_path import BinaryPath from aws_lambda_builders.workflows.java_gradle.gradle import ( diff --git a/tests/unit/workflows/java_gradle/test_gradle_validator.py b/tests/unit/workflows/java_gradle/test_gradle_validator.py index 6b3e2d63b..a3100c58d 100644 --- a/tests/unit/workflows/java_gradle/test_gradle_validator.py +++ b/tests/unit/workflows/java_gradle/test_gradle_validator.py @@ -1,6 +1,6 @@ from unittest import TestCase -from mock import patch, Mock +from unittest.mock import patch, Mock from parameterized import parameterized from aws_lambda_builders.workflows.java_gradle.gradle_validator import GradleValidator from aws_lambda_builders.exceptions import UnsupportedRuntimeError, UnsupportedArchitectureError diff --git a/tests/unit/workflows/java_gradle/test_gradlew_resolver.py b/tests/unit/workflows/java_gradle/test_gradlew_resolver.py index 7b317fbed..49bde5f21 100644 --- a/tests/unit/workflows/java_gradle/test_gradlew_resolver.py +++ b/tests/unit/workflows/java_gradle/test_gradlew_resolver.py @@ -1,6 +1,6 @@ from unittest import TestCase -from mock import patch +from unittest.mock import patch from parameterized import parameterized from aws_lambda_builders.workflows.java_gradle.gradle_resolver import GradleResolver diff --git a/tests/unit/workflows/java_maven/test_actions.py b/tests/unit/workflows/java_maven/test_actions.py index 2aded7f4f..17cf10dea 100644 --- a/tests/unit/workflows/java_maven/test_actions.py +++ b/tests/unit/workflows/java_maven/test_actions.py @@ -1,6 +1,5 @@ -import shutil from unittest import TestCase -from mock import patch, call, ANY +from unittest.mock import patch, call, ANY import os from aws_lambda_builders.actions import ActionFailedError diff --git a/tests/unit/workflows/java_maven/test_maven.py b/tests/unit/workflows/java_maven/test_maven.py index 8ad27a211..e97818d68 100644 --- a/tests/unit/workflows/java_maven/test_maven.py +++ b/tests/unit/workflows/java_maven/test_maven.py @@ -1,7 +1,7 @@ import subprocess from unittest import TestCase -from mock import patch +from unittest.mock import patch from aws_lambda_builders.binary_path import BinaryPath from aws_lambda_builders.workflows.java_maven.maven import SubprocessMaven, MavenExecutionError diff --git a/tests/unit/workflows/java_maven/test_maven_resolver.py b/tests/unit/workflows/java_maven/test_maven_resolver.py index 7234cc1b1..7d52c6390 100644 --- a/tests/unit/workflows/java_maven/test_maven_resolver.py +++ b/tests/unit/workflows/java_maven/test_maven_resolver.py @@ -1,6 +1,6 @@ from unittest import TestCase -from mock import patch +from unittest.mock import patch from aws_lambda_builders.workflows.java_maven.maven_resolver import MavenResolver diff --git a/tests/unit/workflows/java_maven/test_maven_validator.py b/tests/unit/workflows/java_maven/test_maven_validator.py index 702d789b2..0489009ef 100644 --- a/tests/unit/workflows/java_maven/test_maven_validator.py +++ b/tests/unit/workflows/java_maven/test_maven_validator.py @@ -1,6 +1,6 @@ from unittest import TestCase -from mock import patch, Mock +from unittest.mock import patch, Mock from parameterized import parameterized from aws_lambda_builders.workflows.java_maven.maven_validator import MavenValidator from aws_lambda_builders.exceptions import UnsupportedRuntimeError, UnsupportedArchitectureError diff --git a/tests/unit/workflows/java_maven/test_workflow.py b/tests/unit/workflows/java_maven/test_workflow.py index 2dec05309..a5382da66 100644 --- a/tests/unit/workflows/java_maven/test_workflow.py +++ b/tests/unit/workflows/java_maven/test_workflow.py @@ -1,5 +1,5 @@ from unittest import TestCase -from mock import patch, ANY +from unittest.mock import patch, ANY from aws_lambda_builders.workflows.java.actions import JavaCopyDependenciesAction, JavaMoveDependenciesAction from aws_lambda_builders.workflows.java_maven.workflow import JavaMavenWorkflow diff --git a/tests/unit/workflows/nodejs_npm/test_actions.py b/tests/unit/workflows/nodejs_npm/test_actions.py index 0b2bf998e..d7b779922 100644 --- a/tests/unit/workflows/nodejs_npm/test_actions.py +++ b/tests/unit/workflows/nodejs_npm/test_actions.py @@ -1,6 +1,6 @@ import itertools from unittest import TestCase -from mock import patch, call +from unittest.mock import patch, call from parameterized import parameterized from aws_lambda_builders.actions import ActionFailedError diff --git a/tests/unit/workflows/nodejs_npm/test_npm.py b/tests/unit/workflows/nodejs_npm/test_npm.py index a907e716f..3a1ab0508 100644 --- a/tests/unit/workflows/nodejs_npm/test_npm.py +++ b/tests/unit/workflows/nodejs_npm/test_npm.py @@ -1,5 +1,5 @@ from unittest import TestCase -from mock import patch +from unittest.mock import patch from aws_lambda_builders.workflows.nodejs_npm.npm import SubprocessNpm, NpmExecutionError diff --git a/tests/unit/workflows/nodejs_npm/test_workflow.py b/tests/unit/workflows/nodejs_npm/test_workflow.py index 6ebcc7162..f4c967885 100644 --- a/tests/unit/workflows/nodejs_npm/test_workflow.py +++ b/tests/unit/workflows/nodejs_npm/test_workflow.py @@ -1,5 +1,5 @@ from unittest import TestCase -from mock import patch, call +from unittest.mock import patch, call from aws_lambda_builders.actions import CopySourceAction, CleanUpAction, CopyDependenciesAction, MoveDependenciesAction from aws_lambda_builders.architecture import ARM64 diff --git a/tests/unit/workflows/nodejs_npm_esbuild/test_actions.py b/tests/unit/workflows/nodejs_npm_esbuild/test_actions.py index c8dfd722b..5f665f0e2 100644 --- a/tests/unit/workflows/nodejs_npm_esbuild/test_actions.py +++ b/tests/unit/workflows/nodejs_npm_esbuild/test_actions.py @@ -1,7 +1,6 @@ from unittest import TestCase -from unittest.mock import Mock +from unittest.mock import Mock, patch -from mock import patch from parameterized import parameterized from aws_lambda_builders.actions import ActionFailedError diff --git a/tests/unit/workflows/nodejs_npm_esbuild/test_esbuild.py b/tests/unit/workflows/nodejs_npm_esbuild/test_esbuild.py index 304719b09..c9a6945b9 100644 --- a/tests/unit/workflows/nodejs_npm_esbuild/test_esbuild.py +++ b/tests/unit/workflows/nodejs_npm_esbuild/test_esbuild.py @@ -1,5 +1,5 @@ from unittest import TestCase -from mock import patch +from unittest.mock import patch from parameterized import parameterized from aws_lambda_builders.actions import ActionFailedError diff --git a/tests/unit/workflows/nodejs_npm_esbuild/test_workflow.py b/tests/unit/workflows/nodejs_npm_esbuild/test_workflow.py index 70ccb5a73..c9e35b810 100644 --- a/tests/unit/workflows/nodejs_npm_esbuild/test_workflow.py +++ b/tests/unit/workflows/nodejs_npm_esbuild/test_workflow.py @@ -1,8 +1,6 @@ from pathlib import Path from unittest import TestCase -from unittest.mock import ANY - -from mock import patch, call +from unittest.mock import ANY, patch, call from aws_lambda_builders.actions import ( CopySourceAction, @@ -316,9 +314,10 @@ def test_workflow_uses_production_npm_version(self, get_workflow_mock): source_dir="source", install_dir="scratch_dir", subprocess_npm=ANY, osutils=ANY, build_options=None ) + @patch("aws_lambda_builders.workflows.nodejs_npm_esbuild.workflow.NodejsNpmEsbuildWorkflow._get_esbuild_subprocess") @patch("aws_lambda_builders.workflows.nodejs_npm_esbuild.workflow.SubprocessNpm") @patch("aws_lambda_builders.workflows.nodejs_npm_esbuild.workflow.OSUtils") - def test_manifest_not_found(self, osutils_mock, subprocess_npm_mock): + def test_manifest_not_found(self, osutils_mock, subprocess_npm_mock, get_esbuild_subprocess_mock): osutils_mock.file_exists.return_value = False workflow = NodejsNpmEsbuildWorkflow( diff --git a/tests/unit/workflows/python_pip/test_actions.py b/tests/unit/workflows/python_pip/test_actions.py index 85a2c033d..30bfa1db1 100644 --- a/tests/unit/workflows/python_pip/test_actions.py +++ b/tests/unit/workflows/python_pip/test_actions.py @@ -1,7 +1,7 @@ import sys from unittest import TestCase -from mock import patch, Mock, ANY +from unittest.mock import patch, Mock, ANY from aws_lambda_builders.actions import ActionFailedError from aws_lambda_builders.architecture import ARM64, X86_64 diff --git a/tests/unit/workflows/python_pip/test_packager.py b/tests/unit/workflows/python_pip/test_packager.py index f27686af8..77c84c9a8 100644 --- a/tests/unit/workflows/python_pip/test_packager.py +++ b/tests/unit/workflows/python_pip/test_packager.py @@ -1,8 +1,7 @@ import sys from collections import namedtuple -from unittest import TestCase +from unittest import TestCase, mock -import mock import pytest from aws_lambda_builders.architecture import ARM64, X86_64 diff --git a/tests/unit/workflows/python_pip/test_validator.py b/tests/unit/workflows/python_pip/test_validator.py index cf9f7ac23..c0588181f 100644 --- a/tests/unit/workflows/python_pip/test_validator.py +++ b/tests/unit/workflows/python_pip/test_validator.py @@ -1,6 +1,5 @@ -from unittest import TestCase +from unittest import TestCase, mock -import mock from parameterized import parameterized from aws_lambda_builders.exceptions import MisMatchRuntimeError diff --git a/tests/unit/workflows/python_pip/test_workflow.py b/tests/unit/workflows/python_pip/test_workflow.py index 83994acad..71d5b7e19 100644 --- a/tests/unit/workflows/python_pip/test_workflow.py +++ b/tests/unit/workflows/python_pip/test_workflow.py @@ -1,6 +1,5 @@ -import mock -from mock import patch, ANY, Mock from unittest import TestCase +from unittest.mock import patch, ANY, Mock from parameterized import parameterized_class @@ -139,7 +138,7 @@ def test_workflow_sets_up_actions_without_download_dependencies_without_dependen self.assertIsInstance(self.workflow.actions[0], CopySourceAction) def test_workflow_sets_up_actions_without_combine_dependencies(self): - osutils_mock = mock.Mock(spec=self.osutils) + osutils_mock = Mock(spec=self.osutils) osutils_mock.file_exists.return_value = True self.workflow = PythonPipWorkflow( "source", diff --git a/tests/unit/workflows/ruby_bundler/test_actions.py b/tests/unit/workflows/ruby_bundler/test_actions.py index c25392d18..3a95e4f22 100644 --- a/tests/unit/workflows/ruby_bundler/test_actions.py +++ b/tests/unit/workflows/ruby_bundler/test_actions.py @@ -1,5 +1,5 @@ from unittest import TestCase -from mock import patch +from unittest.mock import patch from aws_lambda_builders.actions import ActionFailedError from aws_lambda_builders.workflows.ruby_bundler.actions import RubyBundlerInstallAction, RubyBundlerVendorAction diff --git a/tests/unit/workflows/ruby_bundler/test_bundler.py b/tests/unit/workflows/ruby_bundler/test_bundler.py index ef121f7d1..514d3f3a9 100644 --- a/tests/unit/workflows/ruby_bundler/test_bundler.py +++ b/tests/unit/workflows/ruby_bundler/test_bundler.py @@ -1,9 +1,8 @@ from unittest import TestCase -from mock import patch +from unittest.mock import patch from aws_lambda_builders.workflows.ruby_bundler.bundler import SubprocessBundler, BundlerExecutionError -import mock import logging logger = logging.getLogger("aws_lambda_builders.workflows.ruby_bundler.bundler") @@ -63,7 +62,7 @@ def test_returns_popen_out_decoded_if_retcode_is_0(self): def test_logs_warning_when_gemfile_missing(self): self.popen.returncode = 10 - with mock.patch.object(logger, "warning") as mock_warning: + with patch.object(logger, "warning") as mock_warning: self.under_test.run(["install", "--without", "development", "test"]) mock_warning.assert_called_once_with("Gemfile not found. Continuing the build without dependencies.") diff --git a/tests/unit/workflows/ruby_bundler/test_workflow.py b/tests/unit/workflows/ruby_bundler/test_workflow.py index 33f2424fe..4d7044c3e 100644 --- a/tests/unit/workflows/ruby_bundler/test_workflow.py +++ b/tests/unit/workflows/ruby_bundler/test_workflow.py @@ -1,7 +1,7 @@ from unittest import TestCase from aws_lambda_builders.actions import CopySourceAction, CopyDependenciesAction, CleanUpAction -from aws_lambda_builders.architecture import X86_64, ARM64 +from aws_lambda_builders.architecture import ARM64 from aws_lambda_builders.workflows.ruby_bundler.workflow import RubyBundlerWorkflow from aws_lambda_builders.workflows.ruby_bundler.actions import RubyBundlerInstallAction, RubyBundlerVendorAction diff --git a/tests/unit/workflows/rust_cargo/test_actions.py b/tests/unit/workflows/rust_cargo/test_actions.py index 370fa0011..eba8fe649 100644 --- a/tests/unit/workflows/rust_cargo/test_actions.py +++ b/tests/unit/workflows/rust_cargo/test_actions.py @@ -1,5 +1,5 @@ from unittest import TestCase -from mock import patch +from unittest.mock import patch import io import logging import os