jiuyuan
/
test_ok1
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Tests: Check for ModuleNotFoundError on Python 3.6+ 

Those tests originally checked for ImportError. Since Python 3.6
ModuleNotFoundError is raised in this context instead, the tests didn't work
as they are text based (so exception inheritance does not save the day).

Fixes https://github.com/pytest-dev/pytest/issues/2132
This commit is contained in:
Miro Hrončok 2016-12-13 13:49:44 +01:00
parent da40bcf97f
commit 1680eeb3a3
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
testing/test_doctest.py
View File

@ -4,6 +4,10 @@ import _pytest._code
from _pytest.doctest import DoctestItem, DoctestModule, DoctestTextfile from _pytest.doctest import DoctestItem, DoctestModule, DoctestTextfile
import pytest import pytest
PY36 = sys.version_info[:2] >= (3, 6)
MODULE_NOT_FOUND_ERROR = 'ModuleNotFoundError' if PY36 else 'ImportError'
class TestDoctests: class TestDoctests:
def test_collect_testtextfile(self, testdir): def test_collect_testtextfile(self, testdir):
@ -211,8 +215,8 @@ class TestDoctests:
# doctest is never executed because of error during hello.py collection # doctest is never executed because of error during hello.py collection
result.stdout.fnmatch_lines([ result.stdout.fnmatch_lines([
"*>>> import asdals*", "*>>> import asdals*",
"*UNEXPECTED*ImportError*", "*UNEXPECTED*{e}*".format(e=MODULE_NOT_FOUND_ERROR),
"ImportError: No module named *asdal*", "{e}: No module named *asdal*".format(e=MODULE_NOT_FOUND_ERROR),
]) ])
def test_doctest_unex_importerror_with_module(self, testdir): def test_doctest_unex_importerror_with_module(self, testdir):
@ -227,7 +231,7 @@ class TestDoctests:
# doctest is never executed because of error during hello.py collection # doctest is never executed because of error during hello.py collection
result.stdout.fnmatch_lines([ result.stdout.fnmatch_lines([
"*ERROR collecting hello.py*", "*ERROR collecting hello.py*",
"*ImportError: No module named *asdals*", "*{e}: No module named *asdals*".format(e=MODULE_NOT_FOUND_ERROR),
"*Interrupted: 1 errors during collection*", "*Interrupted: 1 errors during collection*",
]) ])