Merge pull request #4180 from takluyver/iptest-refactor

Iptest refactoring
ipython · Sep 19, 2013 · 2b69cef · 2b69cef
2 parents bc6128a + 0cce019
commit 2b69cef
Show file tree

Hide file tree

Showing 8 changed files with 626 additions and 486 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -10,5 +10,5 @@ before_install:
 install:
     - python setup.py install -q 
 script:
-    - if [[ $TRAVIS_PYTHON_VERSION == '2.'* ]]; then iptest -w /tmp; fi
-    - if [[ $TRAVIS_PYTHON_VERSION == '3.'* ]]; then iptest3 -w /tmp; fi
+    - if [[ $TRAVIS_PYTHON_VERSION == '2.'* ]]; then cd /tmp; iptest; fi
+    - if [[ $TRAVIS_PYTHON_VERSION == '3.'* ]]; then cd /tmp; iptest3; fi
diff --git a/IPython/core/tests/test_debugger.py b/IPython/core/tests/test_debugger.py
@@ -117,8 +117,7 @@ def test_ipdb_magics():
     ipdb> pinfo a
     Type:       ExampleClass
     String Form:ExampleClass()
-    Namespace:  Locals
-    File:       ...
+    Namespace:  Local...
     Docstring:  Docstring for ExampleClass.
     Constructor Docstring:Docstring for ExampleClass.__init__
     ipdb> continue

diff --git a/IPython/scripts/iptest b/IPython/scripts/iptest
@@ -20,5 +20,5 @@ Exiting."""
     import sys
     print >> sys.stderr, error
 else:
-    from IPython.testing import iptest
-    iptest.main()
+    from IPython.testing import iptestcontroller
+    iptestcontroller.main()