From 88385b488933d79512bbe3937c7fcb53e5682e59 2010-07-26 07:42:10
From: Fernando Perez <Fernando.Perez@berkeley.edu>
Date: 2010-07-26 07:42:10
Subject: [PATCH] Fix up and move old irunner tests into proper test suite.

---

diff --git a/IPython/lib/irunner.py b/IPython/lib/irunner.py
old mode 100644
new mode 100755
index 5b8162f..5c97cfa
--- a/IPython/lib/irunner.py
+++ b/IPython/lib/irunner.py
@@ -306,8 +306,8 @@ class IPythonRunner(InteractiveRunner):
         args0 = ['--colors','NoColor',
                  '-pi1','In [\\#]: ',
                  '-pi2','   .\\D.: ',
-                 '--noterm-title',
-                 '--no-auto-indent']
+                 '--no-term-title',
+                 '--no-autoindent']
         if args is None: args = args0
         else: args = args0 + args
         prompts = [r'In \[\d+\]: ',r'   \.*: ']
diff --git a/test/test_irunner.py b/IPython/lib/tests/test_irunner.py
similarity index 92%
rename from test/test_irunner.py
rename to IPython/lib/tests/test_irunner.py
index e5f4ca1..320654c 100755
--- a/test/test_irunner.py
+++ b/IPython/lib/tests/test_irunner.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 """Test suite for the irunner module.
 
 Not the most elegant or fine-grained, but it does cover at least the bulk
@@ -13,7 +12,7 @@ import sys
 import unittest
 
 # IPython imports
-from IPython import irunner
+from IPython.lib import irunner
 
 # Testing code begins
 class RunnerTestCase(unittest.TestCase):
@@ -29,12 +28,12 @@ class RunnerTestCase(unittest.TestCase):
         out = self.out.getvalue()
         #out = ''
         # this output contains nasty \r\n lineends, and the initial ipython
-        # banner.  clean it up for comparison
-        output_l = output.split()
-        out_l = out.split()
+        # banner.  clean it up for comparison, removing lines of whitespace
+        output_l = [l for l in output.splitlines() if l and not l.isspace()]
+        out_l = [l for l in out.splitlines() if l and not l.isspace()]
         mismatch  = 0
-        #if len(output_l) != len(out_l):
-        #    self.fail('mismatch in number of lines')
+        if len(output_l) != len(out_l):
+            self.fail('mismatch in number of lines')
         for n in range(len(output_l)):
             # Do a line-by-line comparison
             ol1 = output_l[n].strip()
@@ -53,7 +52,6 @@ class RunnerTestCase(unittest.TestCase):
         """Test the IPython runner."""
         source = """
 print 'hello, this is python'
-
 # some more code
 x=1;y=2
 x+y**2
@@ -99,11 +97,10 @@ In [7]: autocall 0
 Automatic calling is: OFF
 
 In [8]: cos pi
-------------------------------------------------------------
    File "<ipython console>", line 1
      cos pi
           ^
-<type 'exceptions.SyntaxError'>: invalid syntax
+SyntaxError: invalid syntax
 
 
 In [9]: cos(pi)
@@ -163,6 +160,3 @@ hello, this is python
 that's all folks!
 """
         self._test_runner(runner,source,output)
-        
-if __name__ == '__main__':
-    unittest.main()