Skip to content
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.

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

Fix pytest when pyfakefs + future is installed #441

Merged
merged 1 commit into from
Oct 11, 2018
Merged
Changes from all commits
Commits
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
5 changes: 3 additions & 2 deletions pyfakefs/pytest_plugin.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,16 @@ def my_fakefs_test(fs):
"""

import linecache
import sys

import py
import pytest

from pyfakefs.fake_filesystem_unittest import Patcher

try:
if sys.version_info >= (3,):
import builtins
except ImportError:
else:
import __builtin__ as builtins

Patcher.SKIPMODULES.add(py) # Ignore pytest components when faking filesystem
Expand Down