Merge branch 'mock'

PR #2062

* mock:
  Always use mock from stdlib
  Use unittest.mock instead of mock if available

requirements-test.in

@@ -5,4 +5,3 @@ coverage
 websocket-client<2.0.0
 pytest-cov
 requests
-mock

tests/aws/test_features.py

@@ -3,8 +3,8 @@
 import time
 import shutil
 import uuid
+from unittest import mock
 
-import mock
 import botocore.session
 import pytest
 import requests

tests/functional/cli/test_cli.py

@@ -3,10 +3,10 @@
 import os
 import sys
 import re
+from unittest import mock
 
 import pytest
 from click.testing import CliRunner
-import mock
 from botocore.exceptions import ClientError
 
 from chalice import cli

tests/functional/cli/test_reloader.py

@@ -1,5 +1,5 @@
 import pytest
-import mock
+from unittest import mock
 import threading
 import os
 import unittest

tests/functional/test_awsclient.py

@@ -1,9 +1,9 @@
 import json
 import datetime
 import time
+from unittest import mock
 
 import pytest
-import mock
 import botocore.exceptions
 from botocore.vendored.requests import ConnectionError as \
     RequestsConnectionError

tests/functional/test_deployer.py

@@ -1,7 +1,7 @@
 import os
 import zipfile
 import json
-import mock
+from unittest import mock
 import hashlib
 
 from pytest import fixture

tests/functional/test_package.py

@@ -2,10 +2,10 @@
 import zipfile
 import tarfile
 import io
+from unittest import mock
 from collections import defaultdict, namedtuple
 
 import pytest
-import mock
 
 from chalice.awsclient import TypedAWSClient
 from chalice.config import Config

tests/unit/cli/filewatch/test_eventbased.py

@@ -1,7 +1,7 @@
 import threading
 from subprocess import Popen
+from unittest import mock
 
-import mock
 import pytest
 
 try:

tests/unit/cli/test_cli.py

@@ -1,4 +1,4 @@
-import mock
+from unittest import mock
 import pytest
 import re
 

tests/unit/deploy/test_deployer.py

@@ -6,7 +6,7 @@
 import botocore.session
 
 import pytest
-import mock
+from unittest import mock
 from botocore.stub import Stubber
 from botocore.vendored.requests import ConnectionError as \
     RequestsConnectionError

tests/unit/deploy/test_executor.py

@@ -1,5 +1,5 @@
 import re
-import mock
+from unittest import mock
 import pytest
 
 from chalice.awsclient import TypedAWSClient

tests/unit/deploy/test_planner.py

@@ -1,9 +1,9 @@
-import mock
-
-import pytest
+from unittest import mock
 from dataclasses import replace, dataclass
 from typing import Tuple
 
+import pytest
+
 from chalice.awsclient import TypedAWSClient, ResourceDoesNotExistError
 from chalice.deploy import models
 from chalice.config import DeployedResources

tests/unit/deploy/test_swagger.py

@@ -1,10 +1,11 @@
+from unittest import mock
+
 from chalice.deploy.swagger import (
     SwaggerGenerator, CFNSwaggerGenerator, TerraformSwaggerGenerator)
 from chalice import CORSConfig
 from chalice.app import CustomAuthorizer, CognitoUserPoolAuthorizer
 from chalice.app import IAMAuthorizer, Chalice
 from chalice.deploy.models import RestAPI, IAMPolicy
-import mock
 from pytest import fixture
 
 

tests/unit/deploy/test_validate.py

@@ -1,5 +1,5 @@
 import pytest
-import mock
+from unittest import mock
 
 from chalice.app import Chalice
 from chalice.config import Config

tests/unit/test_local.py

@@ -1,8 +1,9 @@
 import re
 import json
 import decimal
+from unittest import mock
+
 import pytest
-import mock
 from pytest import fixture
 from six import BytesIO
 from six.moves.BaseHTTPServer import HTTPServer

tests/unit/test_logs.py

@@ -1,5 +1,5 @@
 import time
-import mock
+from unittest import mock
 from datetime import datetime, timedelta
 
 from chalice import logs

tests/unit/test_package.py

@@ -1,6 +1,6 @@
 import os
 import json
-import mock
+from unittest import mock
 
 import pytest
 from chalice.config import Config

tests/unit/test_utils.py

@@ -1,6 +1,6 @@
 import os
 import re
-import mock
+from unittest import mock
 import sys
 
 import click