test0908
/
django
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Refs #27025 -- Fixed tests for the new ModuleNotFoundError in Python 3.6. 

http://bugs.python.org/issue15767
This commit is contained in:
Tim Graham 2016-09-15 11:54:22 -04:00
parent 43c471e81c
commit 16202863fa
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
tests/admin_scripts/tests.py
View File

@ -34,6 +34,7 @@ from django.utils.six import PY2, PY3, StringIO
custom_templates_dir = os.path.join(os.path.dirname(upath(__file__)), 'custom_templates') custom_templates_dir = os.path.join(os.path.dirname(upath(__file__)), 'custom_templates')
PY36 = sys.version_info >= (3, 6)
SYSTEM_CHECK_MSG = 'System check identified no issues' SYSTEM_CHECK_MSG = 'System check identified no issues'
@ -1166,7 +1167,7 @@ class ManageCheck(AdminScriptTestCase):
args = ['check'] args = ['check']
out, err = self.run_manage(args) out, err = self.run_manage(args)
self.assertNoOutput(out) self.assertNoOutput(out)
self.assertOutput(err, 'ImportError') self.assertOutput(err, 'ModuleNotFoundError' if PY36 else 'ImportError')
self.assertOutput(err, 'No module named') self.assertOutput(err, 'No module named')
self.assertOutput(err, 'admin_scriptz') self.assertOutput(err, 'admin_scriptz')

4
tests/view_tests/tests/test_debug.py
View File

@ -36,6 +36,8 @@ from ..views import (
if six.PY3: if six.PY3:
from .py3_test_debug import Py3ExceptionReporterTests # NOQA from .py3_test_debug import Py3ExceptionReporterTests # NOQA
PY36 = sys.version_info >= (3, 6)
class User(object): class User(object):
def __str__(self): def __str__(self):
@ -430,7 +432,7 @@ class ExceptionReporterTests(SimpleTestCase):
exc_type, exc_value, tb = sys.exc_info() exc_type, exc_value, tb = sys.exc_info()
reporter = ExceptionReporter(request, exc_type, exc_value, tb) reporter = ExceptionReporter(request, exc_type, exc_value, tb)
html = reporter.get_traceback_html() html = reporter.get_traceback_html()
self.assertIn('<h1>ImportError at /test_view/</h1>', html) self.assertIn('<h1>%sError at /test_view/</h1>' % 'ModuleNotFound' if PY36 else 'Import', html)
def test_ignore_traceback_evaluation_exceptions(self): def test_ignore_traceback_evaluation_exceptions(self):
""" """