mirror of
https://github.com/jupyter/notebook.git
synced 2025-01-06 11:35:24 +08:00
Merge pull request #1813 from takluyver/nose-assert-methods
Add assert_in method to nose for Python 2.6. Closes #1775.
This commit is contained in:
commit
d12819830f
@ -40,6 +40,11 @@ import warnings
|
|||||||
# it for actual use. This should get into nose upstream, but its release cycle
|
# it for actual use. This should get into nose upstream, but its release cycle
|
||||||
# is slow and we need it for our parametric tests to work correctly.
|
# is slow and we need it for our parametric tests to work correctly.
|
||||||
from IPython.testing import nosepatch
|
from IPython.testing import nosepatch
|
||||||
|
|
||||||
|
# Monkeypatch extra assert methods into nose.tools if they're not already there.
|
||||||
|
# This can be dropped once we no longer test on Python 2.6
|
||||||
|
from IPython.testing import nose_assert_methods
|
||||||
|
|
||||||
# Now, proceed to import nose itself
|
# Now, proceed to import nose itself
|
||||||
import nose.plugins.builtin
|
import nose.plugins.builtin
|
||||||
from nose.plugins.xunit import Xunit
|
from nose.plugins.xunit import Xunit
|
||||||
|
Loading…
Reference in New Issue
Block a user