From 7240df06412d86ded1a7daa903a26feee528d717 Mon Sep 17 00:00:00 2001 From: Leo Hemsted Date: Wed, 31 Aug 2016 12:39:11 +0100 Subject: [PATCH] replace mock with unittest.mock --- tests/app/celery/test_tasks.py | 2 +- tests/app/public_contracts/__init__.py | 1 + tests/app/test_statsd_decorators.py | 2 +- tests/conftest.py | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/tests/app/celery/test_tasks.py b/tests/app/celery/test_tasks.py index 547ee769e..d8f90dcd3 100644 --- a/tests/app/celery/test_tasks.py +++ b/tests/app/celery/test_tasks.py @@ -3,7 +3,7 @@ from datetime import datetime import pytest from freezegun import freeze_time -from mock import ANY +from unittest.mock import ANY from sqlalchemy.exc import SQLAlchemyError from sqlalchemy.orm.exc import NoResultFound diff --git a/tests/app/public_contracts/__init__.py b/tests/app/public_contracts/__init__.py index c6f7eee80..c3276dd83 100644 --- a/tests/app/public_contracts/__init__.py +++ b/tests/app/public_contracts/__init__.py @@ -3,6 +3,7 @@ import os from flask import json import jsonschema + def validate(json_string, schema_filename): schema_dir = os.path.join(os.path.dirname(__file__), 'schemas') resolver = jsonschema.RefResolver('file://' + schema_dir + '/', None) diff --git a/tests/app/test_statsd_decorators.py b/tests/app/test_statsd_decorators.py index 3470f9038..dc904f2e1 100644 --- a/tests/app/test_statsd_decorators.py +++ b/tests/app/test_statsd_decorators.py @@ -1,4 +1,4 @@ -from mock import ANY +from unittest.mock import ANY from app.statsd_decorators import statsd import app diff --git a/tests/conftest.py b/tests/conftest.py index c5c57ae7e..abde85bf9 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -1,7 +1,7 @@ import os import boto3 -import mock +from unittest import mock import pytest from alembic.command import upgrade from alembic.config import Config