diff --git a/IPython/testing/iptest.py b/IPython/testing/iptest.py index 02c1a8e..8b42500 100644 --- a/IPython/testing/iptest.py +++ b/IPython/testing/iptest.py @@ -415,9 +415,6 @@ def run_iptest(): argv = sys.argv + [ '--detailed-errors', # extra info in tracebacks - # Loading ipdoctest causes problems with Twisted, but - # our test suite runner now separates things and runs - # all Twisted tests with trial. '--with-ipdoctest', '--ipdoctest-tests','--ipdoctest-extension=txt', @@ -456,7 +453,7 @@ def run_iptestall(): This function constructs :class:`IPTester` instances for all IPython modules and package and then runs each of them. This causes the modules and packages of IPython to be tested each in their own subprocess using - nose or twisted.trial appropriately. + nose. """ runners = make_runners() diff --git a/IPython/testing/tools.py b/IPython/testing/tools.py index 61136d8..a8038b3 100644 --- a/IPython/testing/tools.py +++ b/IPython/testing/tools.py @@ -1,14 +1,9 @@ -"""Generic testing tools that do NOT depend on Twisted. +"""Generic testing tools. In particular, this module exposes a set of top-level assert* functions that can be used in place of nose.tools.assert* in method generators (the ones in nose can not, at least as of nose 0.10.4). -Note: our testing package contains testing.util, which does depend on Twisted -and provides utilities for tests that manage Deferreds. All testing support -tools that only depend on nose, IPython or the standard library should go here -instead. - Authors -------