Skip to content

Use unittest.mock on Python 3.3+ #34

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
carlwgeorge wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Use unittest.mock on Python 3.3+ #34

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion test-requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
pytest
requests-mock
mock
mock;python_version < '3.3'
bandit==1.7.5;python_version > '3'
responses
8 changes: 6 additions & 2 deletions tests/test_purge.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,17 @@
import pytest
import requests_mock
import mock
import responses

try:
from time import monotonic
except ImportError:
from monotonic import monotonic

try:
from unittest.mock import patch
except ImportError:
from mock import patch

from fastpurge import FastPurgeClient, FastPurgeError

# pylint: disable=unused-argument
Expand Down Expand Up @@ -41,7 +45,7 @@ def requests_mocker():
def no_thread_retries():
"""Suppress retries for the duration of this fixture."""

with mock.patch('more_executors.retry.ExceptionRetryPolicy') as policy_class:
with patch('more_executors.retry.ExceptionRetryPolicy') as policy_class:
policy = policy_class.return_value
policy.should_retry.return_value = False
policy.sleep_time.return_value = 0.1
Expand Down