Skip to content

Use unittest.mock on Python > 3.3 #282

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
jelly wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Use unittest.mock on Python > 3.3 #282

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 tests/requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
coveralls
mock
mock; python_version < '3.3'
pytest
pytest-cov
pytest-xdist
Expand Down
5 changes: 4 additions & 1 deletion tests/test_forwarder.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,10 @@
from functools import partial
from contextlib import contextmanager

import mock
try:
from unittest import mock
except ImportError:
import mock
import paramiko
import sshtunnel
import shutil
Expand Down