Fixing small bugs for the release.

* Fixing imports in tests when deps are not present.
* Removed shell.py and test_shell.py as they are old.
* Adding notes about installation and testing.

IPython/frontend/cocoa/tests/test_cocoa_frontend.py

@@ -18,74 +18,75 b' from IPython.kernel.core.interpreter import Interpreter'
 import IPython.kernel.engineservice as es
 from IPython.testing.util import DeferredTestCase
 from twisted.internet.defer import succeed
-from IPython.frontend.cocoa.cocoa_frontend import IPythonCocoaController
-                                                    
-from Foundation import NSMakeRect
-from AppKit import NSTextView, NSScrollView                                                
 
-class TestIPythonCocoaControler(DeferredTestCase):
-    """Tests for IPythonCocoaController"""
+try:
+	from IPython.frontend.cocoa.cocoa_frontend import IPythonCocoaController                                                    
+	from Foundation import NSMakeRect
+	from AppKit import NSTextView, NSScrollView                                                
+except ImportError:
+	class TestIPythonCocoaControler(DeferredTestCase):
+	    """Tests for IPythonCocoaController"""
     
-    def setUp(self):
-        self.controller = IPythonCocoaController.alloc().init()
-        self.engine = es.EngineService()
-        self.engine.startService()
+	    def setUp(self):
+	        self.controller = IPythonCocoaController.alloc().init()
+	        self.engine = es.EngineService()
+	        self.engine.startService()
     
     
-    def tearDown(self):
-        self.controller = None
-        self.engine.stopService()
+	    def tearDown(self):
+	        self.controller = None
+	        self.engine.stopService()
     
-    def testControllerExecutesCode(self):
-        code ="""5+5"""
-        expected = Interpreter().execute(code)
-        del expected['number']
-        def removeNumberAndID(result):
-            del result['number']
-            del result['id']
-            return result
-        self.assertDeferredEquals(
-            self.controller.execute(code).addCallback(removeNumberAndID), 
-            expected)
+	    def testControllerExecutesCode(self):
+	        code ="""5+5"""
+	        expected = Interpreter().execute(code)
+	        del expected['number']
+	        def removeNumberAndID(result):
+	            del result['number']
+	            del result['id']
+	            return result
+	        self.assertDeferredEquals(
+	            self.controller.execute(code).addCallback(removeNumberAndID), 
+	            expected)
     
-    def testControllerMirrorsUserNSWithValuesAsStrings(self):
-        code = """userns1=1;userns2=2"""
-        def testControllerUserNS(result):
-            self.assertEquals(self.controller.userNS['userns1'], 1)
-            self.assertEquals(self.controller.userNS['userns2'], 2)
+	    def testControllerMirrorsUserNSWithValuesAsStrings(self):
+	        code = """userns1=1;userns2=2"""
+	        def testControllerUserNS(result):
+	            self.assertEquals(self.controller.userNS['userns1'], 1)
+	            self.assertEquals(self.controller.userNS['userns2'], 2)
         
-        self.controller.execute(code).addCallback(testControllerUserNS)
+	        self.controller.execute(code).addCallback(testControllerUserNS)
     
     
-    def testControllerInstantiatesIEngine(self):
-        self.assert_(es.IEngineBase.providedBy(self.controller.engine))
+	    def testControllerInstantiatesIEngine(self):
+	        self.assert_(es.IEngineBase.providedBy(self.controller.engine))
     
-    def testControllerCompletesToken(self):
-        code = """longNameVariable=10"""
-        def testCompletes(result):
-            self.assert_("longNameVariable" in result)
+	    def testControllerCompletesToken(self):
+	        code = """longNameVariable=10"""
+	        def testCompletes(result):
+	            self.assert_("longNameVariable" in result)
         
-        def testCompleteToken(result):
-            self.controller.complete("longNa").addCallback(testCompletes)
+	        def testCompleteToken(result):
+	            self.controller.complete("longNa").addCallback(testCompletes)
         
-        self.controller.execute(code).addCallback(testCompletes)
+	        self.controller.execute(code).addCallback(testCompletes)
     
     
-    def testCurrentIndent(self):
-        """test that current_indent_string returns current indent or None.
-        Uses _indent_for_block for direct unit testing.
-        """
+	    def testCurrentIndent(self):
+	        """test that current_indent_string returns current indent or None.
+	        Uses _indent_for_block for direct unit testing.
+	        """
         
-        self.controller.tabUsesSpaces = True
-        self.assert_(self.controller._indent_for_block("""a=3""") == None)
-        self.assert_(self.controller._indent_for_block("") == None)
-        block = """def test():\n    a=3"""
-        self.assert_(self.controller._indent_for_block(block) == \
-                    ' ' * self.controller.tabSpaces)
+	        self.controller.tabUsesSpaces = True
+	        self.assert_(self.controller._indent_for_block("""a=3""") == None)
+	        self.assert_(self.controller._indent_for_block("") == None)
+	        block = """def test():\n    a=3"""
+	        self.assert_(self.controller._indent_for_block(block) == \
+	                    ' ' * self.controller.tabSpaces)
         
-        block = """if(True):\n%sif(False):\n%spass""" % \
-                    (' '*self.controller.tabSpaces,
-                     2*' '*self.controller.tabSpaces)
-        self.assert_(self.controller._indent_for_block(block) == \
-                    2*(' '*self.controller.tabSpaces))
+	        block = """if(True):\n%sif(False):\n%spass""" % \
+	                    (' '*self.controller.tabSpaces,
+	                     2*' '*self.controller.tabSpaces)
+	        self.assert_(self.controller._indent_for_block(block) == \
+	                    2*(' '*self.controller.tabSpaces))
     

IPython/kernel/tests/multienginetest.py

@@ -20,7 +20,6 b' from twisted.internet import defer'
 from IPython.kernel import engineservice as es
 from IPython.kernel import multiengine as me
 from IPython.kernel import newserialized
-from IPython.kernel.error import NotDefined
 from IPython.testing import util
 from IPython.testing.parametric import parametric, Parametric
 from IPython.kernel import newserialized

docs/source/development/development.txt

@@ -349,6 +349,39 b' IPython. The current prototype of ``tconfig`` is located in the IPython sandbox.'
 .. _ConfigObj: http://www.voidspace.org.uk/python/configobj.html
 .. _Traits: http://code.enthought.com/traits/
 
+Installation and testing scenarios
+==================================
+
+This section outlines the various scenarios that we need to test before we release an IPython version.  These scenarios represent different ways of installing IPython and its dependencies.
+
+Installation scenarios
+----------------------
+
+	1.  Install from tarball using `python setup.py install`.
+		a.  With only readline+nose dependencies installed (test1)
+		b.  With all dependencies installed (readline, zope.interface,
+		    Twisted, foolscap, Sphinx, nose, pyOpenSSL) (test2)
+	2.  Install using easy_install.
+	    a.  With only readline+nose dependencies installed (test3)
+			i.  Default dependencies.
+			ii. Optional dependency sets (kernel, doc, test, security)
+			easy_install -f ipython-0.9.beta3-py2.5.egg IPython[kernel,doc,test,security]
+			
+		b.  With all dependencies already installed (test2)
+
+
+Tests to run for these scenarios
+--------------------------------
+
+	1.  Run the full test suite.
+	2.  Start a controller and engines and try a few things by hand.
+		a.  Using ipcluster.
+		b.  Using ipcontroller/ipengine by hand.
+	3.  Run a few of the parallel examples.
+	4.  Try the kernel with and without security with and without PyOpenSSL
+	    installed.
+	5.  Beat on the IPython terminal a bunch.
+	6.  Make sure that furl files are being put in proper locations.