Fixing tests that are broken when dependencies are missing.

I have also fixed a number of other small problems getting ready
for the release.

IPython/frontend/asyncfrontendbase.py

@@ -26,10 +26,10 zope.interface is required to run asynchronous frontends.""" % e.message
 
 from frontendbase import FrontEndBase, IFrontEnd, IFrontEndFactory
 
-from IPython.kernel.engineservice import IEngineCore
 from IPython.kernel.core.history import FrontEndHistory
 
 try:
+    from IPython.kernel.engineservice import IEngineCore
     from twisted.python.failure import Failure
 except ImportError, e:
     e.message = """%s

IPython/frontend/cocoa/tests/test_cocoa_frontend.py

@@ -14,14 +14,18 __docformat__ = "restructuredtext en"
 #---------------------------------------------------------------------------
 # Imports                                                                   
 #---------------------------------------------------------------------------
+
+try:
 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                                                
+except ImportError:
+    import nose
+    raise nose.SkipTest("This test requires zope.interface, Twisted, Foolscap and PyObjC")
 
 class TestIPythonCocoaControler(DeferredTestCase):
     """Tests for IPythonCocoaController"""
@@ -31,7 +35,6 class TestIPythonCocoaControler(DeferredTestCase):
         self.engine = es.EngineService()
         self.engine.startService()
     
-    
     def tearDown(self):
         self.controller = None
         self.engine.stopService()

IPython/frontend/frontendbase.py

@@ -28,7 +28,6 from zopeinterface import Interface, Attribute, implements, classProvides
 
 from IPython.kernel.core.history import FrontEndHistory
 from IPython.kernel.core.util import Bunch
-from IPython.kernel.engineservice import IEngineCore
 
 ##############################################################################
 # TEMPORARY!!! fake configuration, while we decide whether to use tconfig or

IPython/frontend/tests/test_frontendbase.py

@@ -16,9 +16,14 __docformat__ = "restructuredtext en"
 #---------------------------------------------------------------------------
 
 import unittest
+
+try:
 from IPython.frontend.asyncfrontendbase import AsyncFrontEndBase
 from IPython.frontend import frontendbase 
 from IPython.kernel.engineservice import EngineService
+except ImportError:
+    import nose
+    raise nose.SkipTest("This test requires zope.interface, Twisted and Foolscap")
 
 class FrontEndCallbackChecker(AsyncFrontEndBase):
     """FrontEndBase subclass for checking callbacks"""

IPython/kernel/tests/multienginetest.py

@@ -20,7 +20,6 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

IPython/kernel/tests/test_controllerservice.py

@@ -30,8 +30,9 try:
     from controllertest import IControllerCoreTestCase
     from IPython.testing.util import DeferredTestCase
 except ImportError:
-    pass
-else:
+    import nose
+    raise nose.SkipTest("This test requires zope.interface, Twisted and Foolscap")
+
     class BasicControllerServiceTest(DeferredTestCase,
         IControllerCoreTestCase):
     

IPython/kernel/tests/test_enginefc.py

@@ -37,9 +37,10 try:
         IEngineSerializedTestCase, \
         IEngineQueuedTestCase
 except ImportError:
-    print "we got an error!!!"
-    raise
-else:
+    import nose
+    raise nose.SkipTest("This test requires zope.interface, Twisted and Foolscap")
+
+
     class EngineFCTest(DeferredTestCase, 
                        IEngineCoreTestCase, 
                        IEngineSerializedTestCase,

IPython/kernel/tests/test_engineservice.py

@@ -35,8 +35,10 try:
         IEngineQueuedTestCase, \
         IEnginePropertiesTestCase
 except ImportError:
-    pass
-else:
+    import nose
+    raise nose.SkipTest("This test requires zope.interface, Twisted and Foolscap")    
+
+
     class BasicEngineServiceTest(DeferredTestCase,
                                  IEngineCoreTestCase, 
                                  IEngineSerializedTestCase,

IPython/kernel/tests/test_multiengine.py

@@ -23,8 +23,10 try:
     from IPython.kernel.tests.multienginetest import (IMultiEngineTestCase,
         ISynchronousMultiEngineTestCase)
 except ImportError:
-    pass
-else:    
+    import nose
+    raise nose.SkipTest("This test requires zope.interface, Twisted and Foolscap")
+
+ 
     class BasicMultiEngineTestCase(DeferredTestCase, IMultiEngineTestCase):
     
         def setUp(self):

IPython/kernel/tests/test_multienginefc.py

@@ -30,8 +30,8 try:
     from IPython.kernel.error import CompositeError
     from IPython.kernel.util import printer
 except ImportError:
-    pass
-else:
+    import nose
+    raise nose.SkipTest("This test requires zope.interface, Twisted and Foolscap")
     
     def _raise_it(f):
         try:

IPython/kernel/tests/test_newserialized.py

@@ -28,8 +28,9 try:
         SerializeIt, \
         UnSerializeIt
 except ImportError:
-    pass
-else:
+    import nose
+    raise nose.SkipTest("This test requires zope.interface, Twisted and Foolscap")
+
     #-------------------------------------------------------------------------------
     # Tests
     #-------------------------------------------------------------------------------
@@ -99,4 +100,3 else:
                 self.assert_(a.shape == final.shape)
             
             
-    
  No newline at end of file

IPython/kernel/tests/test_pendingdeferred.py

@@ -25,8 +25,8 try:
     from IPython.kernel import error
     from IPython.kernel.util import printer
 except ImportError:
-    pass
-else:
+    import nose
+    raise nose.SkipTest("This test requires zope.interface, Twisted and Foolscap")
     
     class Foo(object):
     

IPython/kernel/tests/test_task.py

@@ -26,8 +26,9 try:
     from IPython.testing.util import DeferredTestCase
     from IPython.kernel.tests.tasktest import ITaskControllerTestCase
 except ImportError:
-    pass
-else:
+    import nose
+    raise nose.SkipTest("This test requires zope.interface, Twisted and Foolscap")
+
     #-------------------------------------------------------------------------------
     # Tests
     #-------------------------------------------------------------------------------

IPython/kernel/tests/test_taskfc.py

@@ -33,8 +33,9 try:
     from IPython.kernel.error import CompositeError
     from IPython.kernel.parallelfunction import ParallelFunction
 except ImportError:
-    pass
-else:
+    import nose
+    raise nose.SkipTest("This test requires zope.interface, Twisted and Foolscap")
+
 
     #-------------------------------------------------------------------------------
     # Tests

docs/source/development/development.txt

@@ -349,6 +349,47 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)
+        
+        virtualenv --no-site-packages test1
+        # Activate it
+        easy_install nose
+        easy_install readline # On OS X or pyreadline on win32
+        cd ipython-0.9.beta3
+        python setup.py install
+        
+        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.