Fixing misc testing related things.

IPython/frontend/asyncfrontendbase.py

@@ -1,76 +1,77 b''
 """
 Base front end class for all async frontends.
 """
 __docformat__ = "restructuredtext en"
 
 #-------------------------------------------------------------------------------
 #  Copyright (C) 2008  The IPython Development Team
 #
 #  Distributed under the terms of the BSD License.  The full license is in
 #  the file COPYING, distributed as part of this software.
 #-------------------------------------------------------------------------------
 
 
 #-------------------------------------------------------------------------------
 # Imports
 #-------------------------------------------------------------------------------
-from IPython.external import guid
 
+from IPython.external import guid
 
 from zope.interface import Interface, Attribute, implements, classProvides
 from twisted.python.failure import Failure
-from IPython.frontend.frontendbase import FrontEndBase, IFrontEnd, IFrontEndFactory
+from IPython.frontend.frontendbase import (
+    FrontEndBase, IFrontEnd, IFrontEndFactory)
 from IPython.kernel.core.history import FrontEndHistory
 from IPython.kernel.engineservice import IEngineCore
 
 
 class AsyncFrontEndBase(FrontEndBase):
     """
     Overrides FrontEndBase to wrap execute in a deferred result.
     All callbacks are made as callbacks on the deferred result.
     """
     
     implements(IFrontEnd)
     classProvides(IFrontEndFactory)
     
     def __init__(self, engine=None, history=None):
         assert(engine==None or IEngineCore.providedBy(engine))
         self.engine = IEngineCore(engine)
         if history is None:
                 self.history = FrontEndHistory(input_cache=[''])
         else:
             self.history = history
     
     
     def execute(self, block, blockID=None):
         """Execute the block and return the deferred result.
         
         Parameters:
             block : {str, AST}
             blockID : any
                 Caller may provide an ID to identify this block. 
                 result['blockID'] := blockID
         
         Result:
             Deferred result of self.interpreter.execute
         """
         
         if(not self.is_complete(block)):
             return Failure(Exception("Block is not compilable"))
         
         if(blockID == None):
             blockID = guid.generate() 
         
         d = self.engine.execute(block)
         d.addCallback(self._add_history, block=block)
         d.addCallbacks(self._add_block_id_for_result,
                 errback=self._add_block_id_for_failure,
                 callbackArgs=(blockID,),
                 errbackArgs=(blockID,))
         d.addBoth(self.update_cell_prompt, blockID=blockID)
         d.addCallbacks(self.render_result, 
             errback=self.render_error)
         
         return d
     
 

IPython/frontend/cocoa/tests/test_cocoa_frontend.py

@@ -1,95 +1,100 b''
 # encoding: utf-8
 """This file contains unittests for the 
 IPython.frontend.cocoa.cocoa_frontend module.
 """
 __docformat__ = "restructuredtext en"
                                                                             
 #---------------------------------------------------------------------------
 #       Copyright (C) 2005  The IPython Development Team    
 #                                                                           
 #  Distributed under the terms of the BSD License.  The full license is in  
 #  the file COPYING, distributed as part of this software.                  
 #---------------------------------------------------------------------------
                                                                             
 #---------------------------------------------------------------------------
 # Imports                                                                   
 #---------------------------------------------------------------------------
 
+# Tell nose to skip this module
+__test__ = {}
+
+from twisted.trial import unittest
+from twisted.internet.defer import succeed
+
+from IPython.kernel.core.interpreter import Interpreter
+import IPython.kernel.engineservice as es
 
 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 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")
+    # This tells twisted.trial to skip this module if PyObjC is not found
+    skip = True
 
-class TestIPythonCocoaControler(DeferredTestCase):
+#---------------------------------------------------------------------------
+# Tests
+#---------------------------------------------------------------------------
+class TestIPythonCocoaControler(unittest.TestCase):
     """Tests for IPythonCocoaController"""
-   
+
     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 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)
-   
+        d = self.controller.execute(code)
+        d.addCallback(removeNumberAndID)
+        d.addCallback(lambda r: self.assertEquals(r, 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)
-       
         self.controller.execute(code).addCallback(testControllerUserNS)
-   
-   
+
     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 testCompleteToken(result):
             self.controller.complete("longNa").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.
         """
-       
+        
         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))
-   
+

IPython/frontend/tests/test_asyncfrontendbase.py

@@ -1,111 +1,109 b''
 # encoding: utf-8
 
 """This file contains unittests for the asyncfrontendbase module."""
 
 __docformat__ = "restructuredtext en"
 
 #---------------------------------------------------------------------------
 #  Copyright (C) 2008  The IPython Development Team                         
 #                                                                           
 #  Distributed under the terms of the BSD License.  The full license is in  
 #  the file COPYING, distributed as part of this software.                  
 #---------------------------------------------------------------------------
                                                                             
 #---------------------------------------------------------------------------
 # Imports                                                                   
 #---------------------------------------------------------------------------
 
+# Tell nose to skip this module
+__test__ = {}
 
-try:
-    from twisted.trial import unittest
-    from IPython.frontend.asyncfrontendbase import AsyncFrontEndBase
-    from IPython.frontend import frontendbase 
-    from IPython.kernel.engineservice import EngineService
-    from IPython.testing.parametric import Parametric, parametric
-except ImportError:
-    import nose
-    raise nose.SkipTest("This test requires zope.interface, Twisted and Foolscap")
+from twisted.trial import unittest
+from IPython.frontend.asyncfrontendbase import AsyncFrontEndBase
+from IPython.frontend import frontendbase 
+from IPython.kernel.engineservice import EngineService
+from IPython.testing.parametric import Parametric, parametric
 
 
 class FrontEndCallbackChecker(AsyncFrontEndBase):
     """FrontEndBase subclass for checking callbacks"""
     def __init__(self, engine=None, history=None):
         super(FrontEndCallbackChecker, self).__init__(engine=engine, 
                                                     history=history)
         self.updateCalled = False
         self.renderResultCalled = False
         self.renderErrorCalled = False
    
     def update_cell_prompt(self, result, blockID=None):
         self.updateCalled = True
         return result
    
     def render_result(self, result):
         self.renderResultCalled = True
         return result
     
     def render_error(self, failure):
         self.renderErrorCalled = True
         return failure
 
 
 class TestAsyncFrontendBase(unittest.TestCase):
     def setUp(self):
         """Setup the EngineService and FrontEndBase"""
         
         self.fb = FrontEndCallbackChecker(engine=EngineService())
     
     def test_implements_IFrontEnd(self):
         self.assert_(frontendbase.IFrontEnd.implementedBy(
                                     AsyncFrontEndBase))
     
     def test_is_complete_returns_False_for_incomplete_block(self):
         block = """def test(a):"""
         self.assert_(self.fb.is_complete(block) == False)
     
     def test_is_complete_returns_True_for_complete_block(self):
         block = """def test(a): pass"""
         self.assert_(self.fb.is_complete(block))
         block = """a=3"""
         self.assert_(self.fb.is_complete(block))
     
     def test_blockID_added_to_result(self):
         block = """3+3"""
         d = self.fb.execute(block, blockID='TEST_ID')
         d.addCallback(lambda r: self.assert_(r['blockID']=='TEST_ID'))
         return d
     
     def test_blockID_added_to_failure(self):
         block = "raise Exception()"
         d = self.fb.execute(block,blockID='TEST_ID')
         d.addErrback(lambda f: self.assert_(f.blockID=='TEST_ID'))
         return d
     
     def test_callbacks_added_to_execute(self):
         d = self.fb.execute("10+10")
         d.addCallback(lambda r: self.assert_(self.fb.updateCalled and self.fb.renderResultCalled))
         return d
     
     def test_error_callback_added_to_execute(self):
         """Test that render_error called on execution error."""
         
         d = self.fb.execute("raise Exception()")
         d.addErrback(lambda f: self.assert_(self.fb.renderErrorCalled))
         return d
     
     def test_history_returns_expected_block(self):
         """Make sure history browsing doesn't fail."""
         
         blocks = ["a=1","a=2","a=3"]
         d = self.fb.execute(blocks[0])
         d.addCallback(lambda _: self.fb.execute(blocks[1]))
         d.addCallback(lambda _: self.fb.execute(blocks[2]))
         d.addCallback(lambda _: self.assert_(self.fb.get_history_previous("")==blocks[-2]))
         d.addCallback(lambda _: self.assert_(self.fb.get_history_previous("")==blocks[-3]))
         d.addCallback(lambda _: self.assert_(self.fb.get_history_next()==blocks[-2]))
         return d
     
     def test_history_returns_none_at_startup(self):        
         self.assert_(self.fb.get_history_previous("")==None)
         self.assert_(self.fb.get_history_next()==None)
 

IPython/frontend/tests/test_process.py

@@ -1,67 +1,67 b''
 # encoding: utf-8
 """
 Test process execution and IO redirection.
 """
 
 __docformat__ = "restructuredtext en"
 
-#-------------------------------------------------------------------------------
-#  Copyright (C) 2008  The IPython Development Team
+#-----------------------------------------------------------------------------
+#  Copyright (C) 2008-2009  The IPython Development Team
 #
 #  Distributed under the terms of the BSD License.  The full license is
 #  in the file COPYING, distributed as part of this software.
-#-------------------------------------------------------------------------------
+#-----------------------------------------------------------------------------
 
 from cStringIO import StringIO
 from time import sleep
 import sys
 
 from IPython.frontend.process import PipedProcess
 from IPython.testing import decorators as testdec
 
 
 def test_capture_out():
     """ A simple test to see if we can execute a process and get the output.
     """
     s = StringIO()
     p = PipedProcess('echo 1', out_callback=s.write, )
     p.start()
     p.join()
     result = s.getvalue().rstrip()
     assert result == '1'
 
 
 def test_io():
     """ Checks that we can send characters on stdin to the process.
     """
     s = StringIO()
     p = PipedProcess(sys.executable + ' -c "a = raw_input(); print a"', 
                             out_callback=s.write, )
     p.start()
     test_string = '12345\n'
     while not hasattr(p, 'process'):
         sleep(0.1)
     p.process.stdin.write(test_string)
     p.join()
     result = s.getvalue()
     assert result == test_string
 
 
 def test_kill():
     """ Check that we can kill a process, and its subprocess.
     """
     s = StringIO()
     p = PipedProcess(sys.executable + ' -c "a = raw_input();"', 
                             out_callback=s.write, )
     p.start()
     while not hasattr(p, 'process'):
         sleep(0.1)
     p.process.kill() 
     assert p.process.poll() is not None
 
 
 if __name__ == '__main__':
     test_capture_out()
     test_io()
     test_kill()
 

IPython/kernel/core/tests/test_interpreter.py

@@ -1,61 +1,64 b''
 # encoding: utf-8
 
 """This file contains unittests for the interpreter.py module."""
 
 __docformat__ = "restructuredtext en"
 
 #-----------------------------------------------------------------------------
 #  Copyright (C) 2008-2009  The IPython Development Team                           
 #                                                                             
 #  Distributed under the terms of the BSD License.  The full license is in    
 #  the file COPYING, distributed as part of this software.                    
 #-----------------------------------------------------------------------------
 
 #-----------------------------------------------------------------------------
 # Imports                                                                     
 #-----------------------------------------------------------------------------
 
 import unittest
 from IPython.kernel.core.interpreter import Interpreter
 
 #-----------------------------------------------------------------------------
 # Tests 
 #-----------------------------------------------------------------------------
 
+# Tell nose to skip this module
+__test__ = {}
+
 class TestInterpreter(unittest.TestCase):
 
     def test_unicode(self):
         """ Test unicode handling with the interpreter."""
         i = Interpreter()
         i.execute_python(u'print "ù"')
         i.execute_python('print "ù"')
 
     def test_ticket266993(self):
         """ Test for ticket 266993."""
         i = Interpreter()
         i.execute('str("""a\nb""")')
 
     def test_ticket364347(self):
         """Test for ticket 364347."""
         i = Interpreter()
         i.split_commands('str("a\\nb")')
 
     def test_split_commands(self):
         """ Test that commands are indeed individually split."""
         i = Interpreter()
         test_atoms = [('(1\n + 1)', ),
                       ('1', '1', ),
                       ]
         for atoms in test_atoms:
             atoms = [atom.rstrip() + '\n' for atom in atoms]
             self.assertEquals(i.split_commands(''.join(atoms)),atoms)
 
     def test_long_lines(self):
         """ Test for spurious syntax error created by the interpreter."""
         test_strings = [u'( 1 +\n 1\n )\n\n',
                         u'(1 \n + 1\n )\n\n',
                        ]
         i = Interpreter()
         for s in test_strings:
             i.execute(s)
 

IPython/kernel/core/tests/test_notification.py

@@ -1,171 +1,174 b''
 # encoding: utf-8
 
 """This file contains unittests for the notification.py module."""
 
 __docformat__ = "restructuredtext en"
 
 #-----------------------------------------------------------------------------
 #  Copyright (C) 2008  The IPython Development Team                           
 #                                                                             
 #  Distributed under the terms of the BSD License.  The full license is in    
 #  the file COPYING, distributed as part of this software.                    
 #-----------------------------------------------------------------------------
                                                                               
 #-----------------------------------------------------------------------------
 # Imports                                                                     
 #-----------------------------------------------------------------------------
 
+# Tell nose to skip this module
+__test__ = {}
+
 import unittest
 import IPython.kernel.core.notification as notification
 from nose.tools import timed
 
 #
 # Supporting test classes
 #
 
 class Observer(object):
     """docstring for Observer"""
     def __init__(self, expectedType, expectedSender, 
                     center=notification.sharedCenter, **kwargs):
         super(Observer, self).__init__()
         self.expectedType = expectedType
         self.expectedSender = expectedSender
         self.expectedKwArgs = kwargs
         self.recieved = False
         center.add_observer(self.callback, 
                             self.expectedType, 
                             self.expectedSender)
     
     
     def callback(self, theType, sender, args={}):
         """callback"""
         
         assert(theType == self.expectedType or
                 self.expectedType == None)
         assert(sender == self.expectedSender or
                 self.expectedSender == None)
         assert(args == self.expectedKwArgs)
         self.recieved = True
     
     
     def verify(self):
         """verify"""
         
         assert(self.recieved)
     
     def reset(self):
         """reset"""
         
         self.recieved = False
     
 
 
 class Notifier(object):
     """docstring for Notifier"""
     def __init__(self, theType, **kwargs):
         super(Notifier, self).__init__()
         self.theType = theType
         self.kwargs = kwargs
     
     def post(self, center=notification.sharedCenter):
         """fire"""
         
         center.post_notification(self.theType, self,
             **self.kwargs)
     
 
 #
 # Test Cases
 #
 
 class NotificationTests(unittest.TestCase):
     """docstring for NotificationTests"""
     
     def tearDown(self):
         notification.sharedCenter.remove_all_observers()
     
     def test_notification_delivered(self):
         """Test that notifications are delivered"""
         expectedType = 'EXPECTED_TYPE'
         sender = Notifier(expectedType)
         observer = Observer(expectedType, sender)
         
         sender.post()
         
         observer.verify()
     
     
     def test_type_specificity(self):
         """Test that observers are registered by type"""
         
         expectedType = 1
         unexpectedType = "UNEXPECTED_TYPE"
         sender = Notifier(expectedType)
         unexpectedSender = Notifier(unexpectedType)
         observer = Observer(expectedType, sender)
     
         sender.post()
         unexpectedSender.post()
     
         observer.verify()
     
     
     def test_sender_specificity(self):
         """Test that observers are registered by sender"""
         
         expectedType = "EXPECTED_TYPE"
         sender1 = Notifier(expectedType)
         sender2 = Notifier(expectedType)
         observer = Observer(expectedType, sender1)
         
         sender1.post()
         sender2.post()
         
         observer.verify()
     
     
     def test_remove_all_observers(self):
         """White-box test for remove_all_observers"""
         
         for i in xrange(10):
             Observer('TYPE', None, center=notification.sharedCenter)
         
         self.assert_(len(notification.sharedCenter.observers[('TYPE',None)]) >= 10, 
             "observers registered")
         
         notification.sharedCenter.remove_all_observers()
         
         self.assert_(len(notification.sharedCenter.observers) == 0, "observers removed")
     
     
     def test_any_sender(self):
         """test_any_sender"""
         
         expectedType = "EXPECTED_TYPE"
         sender1 = Notifier(expectedType)
         sender2 = Notifier(expectedType)
         observer = Observer(expectedType, None)
         
         
         sender1.post()
         observer.verify()
         
         observer.reset()
         sender2.post()
         observer.verify()
         
     
     @timed(.01)
     def test_post_performance(self):
         """Test that post_notification, even with many registered irrelevant
         observers is fast"""
         
         for i in xrange(10):
             Observer("UNRELATED_TYPE", None)
         
         o = Observer('EXPECTED_TYPE', None)
         
         notification.sharedCenter.post_notification('EXPECTED_TYPE', self)
         
         o.verify()
     

IPython/kernel/core/tests/test_redirectors.py

@@ -1,70 +1,70 b''
 # encoding: utf-8
 """
 Test the output capture at the OS level, using file descriptors.
 """
 
 __docformat__ = "restructuredtext en"
 
 #-------------------------------------------------------------------------------
 #  Copyright (C) 2008  The IPython Development Team
 #
 #  Distributed under the terms of the BSD License.  The full license is
 #  in the file COPYING, distributed as part of this software.
 #-------------------------------------------------------------------------------
 
+# Tell nose to skip this module
+__test__ = {}
 
-# Stdlib imports
 import os
 from cStringIO import StringIO
 
-# Our own imports
 from IPython.testing import decorators as dec
 
 #-----------------------------------------------------------------------------
 # Test functions
 
 @dec.skip_win32
 def test_redirector():
     """ Checks that the redirector can be used to do synchronous capture.
     """
     from IPython.kernel.core.fd_redirector import FDRedirector
     r = FDRedirector()
     out = StringIO()
     try:
         r.start()
         for i in range(10):
             os.system('echo %ic' % i)
             print >>out, r.getvalue(),
             print >>out, i
     except:
         r.stop()
         raise
     r.stop()
     result1 = out.getvalue()
     result2 = "".join("%ic\n%i\n" %(i, i) for i in range(10))
     assert result1 == result2
 
 
 @dec.skip_win32
 def test_redirector_output_trap():
     """ This test check not only that the redirector_output_trap does
         trap the output, but also that it does it in a gready way, that
         is by calling the callback ASAP.
     """
     from IPython.kernel.core.redirector_output_trap import RedirectorOutputTrap
     out = StringIO()
     trap = RedirectorOutputTrap(out.write, out.write)
     try:
         trap.set()
         for i in range(10):
             os.system('echo %ic' % i)
             print "%ip" % i
             print >>out, i
     except:
         trap.unset()
         raise
     trap.unset()
     result1 = out.getvalue()
     result2 = "".join("%ic\n%ip\n%i\n" %(i, i, i) for i in range(10))
     assert result1 == result2
     

IPython/kernel/tests/test_contexts.py

@@ -1,43 +1,46 b''
+# Tell nose to skip this module
+__test__ = {}
+
 #from __future__ import with_statement
 
 # XXX This file is currently disabled to preserve 2.4 compatibility.
 
 #def test_simple():
 if 0:
 
     # XXX - for now, we need a running cluster to be started separately.  The
     # daemon work is almost finished, and will make much of this unnecessary.
     from IPython.kernel import client
     mec = client.MultiEngineClient(('127.0.0.1',10105))
 
     try:
         mec.get_ids()
     except ConnectionRefusedError:
         import os, time
         os.system('ipcluster -n 2 &')
         time.sleep(2)
         mec = client.MultiEngineClient(('127.0.0.1',10105))
 
     mec.block = False
 
     import itertools
     c = itertools.count()
 
     parallel = RemoteMultiEngine(mec)
 
     mec.pushAll()
 
     ## with parallel as pr:
     ##     # A comment
     ##     remote()  # this means the code below only runs remotely
     ##     print 'Hello remote world'
     ##     x = range(10)
     ##     # Comments are OK
     ##     # Even misindented.
     ##     y = x+1
 
 
     ## with pfor('i',sequence) as pr:
     ##     print x[i]
 
     print pr.x + pr.y

IPython/kernel/tests/test_controllerservice.py

@@ -1,44 +1,44 b''
 # encoding: utf-8
 
 """This file contains unittests for the kernel.engineservice.py module.
 
 Things that should be tested:
 
  - Should the EngineService return Deferred objects?
  - Run the same tests that are run in shell.py.
  - Make sure that the Interface is really implemented.
  - The startService and stopService methods.
 """
 
 __docformat__ = "restructuredtext en"
 
 #-------------------------------------------------------------------------------
 #  Copyright (C) 2008  The IPython Development Team
 #
 #  Distributed under the terms of the BSD License.  The full license is in
 #  the file COPYING, distributed as part of this software.
 #-------------------------------------------------------------------------------
 
 #-------------------------------------------------------------------------------
 # Imports
 #-------------------------------------------------------------------------------
 
-try:
-    from twisted.application.service import IService
-    from IPython.kernel.controllerservice import ControllerService
-    from IPython.kernel.tests import multienginetest as met
-    from controllertest import IControllerCoreTestCase
-    from IPython.testing.util import DeferredTestCase
-except ImportError:
-    import nose
-    raise nose.SkipTest("This test requires zope.interface, Twisted and Foolscap")
+# Tell nose to skip this module
+__test__ = {}
+
+from twisted.application.service import IService
+from IPython.kernel.controllerservice import ControllerService
+from IPython.kernel.tests import multienginetest as met
+from controllertest import IControllerCoreTestCase
+from IPython.testing.util import DeferredTestCase
+
 
 class BasicControllerServiceTest(DeferredTestCase,
     IControllerCoreTestCase):
 
     def setUp(self):
         self.controller  = ControllerService()
         self.controller.startService()
 
     def tearDown(self):
         self.controller.stopService()

IPython/kernel/tests/test_enginefc.py

@@ -1,93 +1,92 b''
 # encoding: utf-8
 
 """This file contains unittests for the enginepb.py module."""
 
 __docformat__ = "restructuredtext en"
 
 #-------------------------------------------------------------------------------
 #  Copyright (C) 2008  The IPython Development Team
 #
 #  Distributed under the terms of the BSD License.  The full license is in
 #  the file COPYING, distributed as part of this software.
 #-------------------------------------------------------------------------------
 
 #-------------------------------------------------------------------------------
 # Imports
 #-------------------------------------------------------------------------------
 
-try:
-    from twisted.python import components
-    from twisted.internet import reactor, defer
-    from twisted.spread import pb
-    from twisted.internet.base import DelayedCall
-    DelayedCall.debug = True
+# Tell nose to skip this module
+__test__ = {}
 
-    import zope.interface as zi
+from twisted.python import components
+from twisted.internet import reactor, defer
+from twisted.spread import pb
+from twisted.internet.base import DelayedCall
+DelayedCall.debug = True
 
-    from IPython.kernel.fcutil import Tub, UnauthenticatedTub
-    from IPython.kernel import engineservice as es
-    from IPython.testing.util import DeferredTestCase
-    from IPython.kernel.controllerservice import IControllerBase
-    from IPython.kernel.enginefc import FCRemoteEngineRefFromService, IEngineBase
-    from IPython.kernel.engineservice import IEngineQueued
-    from IPython.kernel.engineconnector import EngineConnector
-    
-    from IPython.kernel.tests.engineservicetest import \
-        IEngineCoreTestCase, \
-        IEngineSerializedTestCase, \
-        IEngineQueuedTestCase
-except ImportError:
-    import nose
-    raise nose.SkipTest("This test requires zope.interface, Twisted and Foolscap")
+import zope.interface as zi
+
+from IPython.kernel.fcutil import Tub, UnauthenticatedTub
+from IPython.kernel import engineservice as es
+from IPython.testing.util import DeferredTestCase
+from IPython.kernel.controllerservice import IControllerBase
+from IPython.kernel.enginefc import FCRemoteEngineRefFromService, IEngineBase
+from IPython.kernel.engineservice import IEngineQueued
+from IPython.kernel.engineconnector import EngineConnector
+
+from IPython.kernel.tests.engineservicetest import \
+    IEngineCoreTestCase, \
+    IEngineSerializedTestCase, \
+    IEngineQueuedTestCase
 
 
 class EngineFCTest(DeferredTestCase, 
                  IEngineCoreTestCase, 
                  IEngineSerializedTestCase,
                  IEngineQueuedTestCase
                  ):
  
   zi.implements(IControllerBase)
  
   def setUp(self):
  
       # Start a server and append to self.servers
       self.controller_reference = FCRemoteEngineRefFromService(self)
       self.controller_tub = Tub()
       self.controller_tub.listenOn('tcp:10105:interface=127.0.0.1')
       self.controller_tub.setLocation('127.0.0.1:10105')
      
       furl = self.controller_tub.registerReference(self.controller_reference)
       self.controller_tub.startService()
      
       # Start an EngineService and append to services/client
       self.engine_service = es.EngineService()
       self.engine_service.startService()
       self.engine_tub = Tub()
       self.engine_tub.startService()
       engine_connector = EngineConnector(self.engine_tub)
       d = engine_connector.connect_to_controller(self.engine_service, furl)
       # This deferred doesn't fire until after register_engine has returned and
       # thus, self.engine has been defined and the tets can proceed.
       return d
  
   def tearDown(self):
       dlist = []
       # Shut down the engine
       d = self.engine_tub.stopService()
       dlist.append(d)
       # Shut down the controller
       d = self.controller_tub.stopService()
       dlist.append(d)
       return defer.DeferredList(dlist)
  
   #---------------------------------------------------------------------------
   # Make me look like a basic controller
   #---------------------------------------------------------------------------
  
   def register_engine(self, engine_ref, id=None, ip=None, port=None, pid=None):
       self.engine = IEngineQueued(IEngineBase(engine_ref))
       return {'id':id}
  
   def unregister_engine(self, id):
       pass
  No newline at end of file

IPython/kernel/tests/test_engineservice.py

@@ -1,80 +1,79 b''
 # encoding: utf-8
 
 """This file contains unittests for the kernel.engineservice.py module.
 
 Things that should be tested:
 
  - Should the EngineService return Deferred objects?
  - Run the same tests that are run in shell.py.
  - Make sure that the Interface is really implemented.
  - The startService and stopService methods.
 """
 
 __docformat__ = "restructuredtext en"
 
 #-------------------------------------------------------------------------------
 #  Copyright (C) 2008  The IPython Development Team
 #
 #  Distributed under the terms of the BSD License.  The full license is in
 #  the file COPYING, distributed as part of this software.
 #-------------------------------------------------------------------------------
 
 #-------------------------------------------------------------------------------
 # Imports
 #-------------------------------------------------------------------------------
 
-try:
-    from twisted.internet import defer
-    from twisted.application.service import IService
-    
-    from IPython.kernel import engineservice as es
-    from IPython.testing.util import DeferredTestCase
-    from IPython.kernel.tests.engineservicetest import \
-        IEngineCoreTestCase, \
-        IEngineSerializedTestCase, \
-        IEngineQueuedTestCase, \
-        IEnginePropertiesTestCase
-except ImportError:
-    import nose
-    raise nose.SkipTest("This test requires zope.interface, Twisted and Foolscap")    
+# Tell nose to skip this module
+__test__ = {}
+
+from twisted.internet import defer
+from twisted.application.service import IService
+
+from IPython.kernel import engineservice as es
+from IPython.testing.util import DeferredTestCase
+from IPython.kernel.tests.engineservicetest import \
+    IEngineCoreTestCase, \
+    IEngineSerializedTestCase, \
+    IEngineQueuedTestCase, \
+    IEnginePropertiesTestCase
 
 
 class BasicEngineServiceTest(DeferredTestCase,
                              IEngineCoreTestCase, 
                              IEngineSerializedTestCase,
                              IEnginePropertiesTestCase):
 
     def setUp(self):
         self.engine = es.EngineService()
         self.engine.startService()
 
     def tearDown(self):
         return self.engine.stopService()
 
 class ThreadedEngineServiceTest(DeferredTestCase,
                              IEngineCoreTestCase, 
                              IEngineSerializedTestCase,
                              IEnginePropertiesTestCase):
 
     def setUp(self):
         self.engine = es.ThreadedEngineService()
         self.engine.startService()
 
     def tearDown(self):
         return self.engine.stopService()
 
 class QueuedEngineServiceTest(DeferredTestCase,
                               IEngineCoreTestCase, 
                               IEngineSerializedTestCase,
                               IEnginePropertiesTestCase,
                               IEngineQueuedTestCase):
                           
     def setUp(self):
         self.rawEngine = es.EngineService()
         self.rawEngine.startService()
         self.engine = es.IEngineQueued(self.rawEngine)
     
     def tearDown(self):
         return self.rawEngine.stopService()
 
 

IPython/kernel/tests/test_multiengine.py

@@ -1,56 +1,55 b''
 # encoding: utf-8
 
 """"""
 
 __docformat__ = "restructuredtext en"
 
 #-----------------------------------------------------------------------------
 #  Copyright (C) 2008  The IPython Development Team
 #
 #  Distributed under the terms of the BSD License.  The full license is in
 #  the file COPYING, distributed as part of this software.
 #-----------------------------------------------------------------------------
 
 #-----------------------------------------------------------------------------
 # Imports
 #-----------------------------------------------------------------------------
 
-try:
-    from twisted.internet import defer
-    from IPython.testing.util import DeferredTestCase
-    from IPython.kernel.controllerservice import ControllerService
-    from IPython.kernel import multiengine as me
-    from IPython.kernel.tests.multienginetest import (IMultiEngineTestCase,
-        ISynchronousMultiEngineTestCase)
-except ImportError:
-    import nose
-    raise nose.SkipTest("This test requires zope.interface, Twisted and Foolscap")
-
- 
+# Tell nose to skip this module
+__test__ = {}
+
+from twisted.internet import defer
+from IPython.testing.util import DeferredTestCase
+from IPython.kernel.controllerservice import ControllerService
+from IPython.kernel import multiengine as me
+from IPython.kernel.tests.multienginetest import (IMultiEngineTestCase,
+    ISynchronousMultiEngineTestCase)
+
+
 class BasicMultiEngineTestCase(DeferredTestCase, IMultiEngineTestCase):
 
     def setUp(self):
         self.controller = ControllerService()
         self.controller.startService()
         self.multiengine = me.IMultiEngine(self.controller)
         self.engines = []
     
     def tearDown(self):
         self.controller.stopService()
         for e in self.engines:
             e.stopService()
 
 
 class SynchronousMultiEngineTestCase(DeferredTestCase, ISynchronousMultiEngineTestCase):
 
     def setUp(self):
         self.controller = ControllerService()
         self.controller.startService()
         self.multiengine = me.ISynchronousMultiEngine(me.IMultiEngine(self.controller))
         self.engines = []
     
     def tearDown(self):
         self.controller.stopService()
         for e in self.engines:
             e.stopService()
 

IPython/kernel/tests/test_multienginefc.py

@@ -1,144 +1,144 b''
 #!/usr/bin/env python
 # encoding: utf-8
 
 __docformat__ = "restructuredtext en"
 
 #-------------------------------------------------------------------------------
 #  Copyright (C) 2008  The IPython Development Team
 #
 #  Distributed under the terms of the BSD License.  The full license is in
 #  the file COPYING, distributed as part of this software.
 #-------------------------------------------------------------------------------
 
 #-------------------------------------------------------------------------------
 # Imports
 #-------------------------------------------------------------------------------
 
-try:
-    from twisted.internet import defer, reactor
+# Tell nose to skip this module
+__test__ = {}
+
+from twisted.internet import defer, reactor
+
+from IPython.kernel.fcutil import Tub, UnauthenticatedTub
+
+from IPython.testing.util import DeferredTestCase
+from IPython.kernel.controllerservice import ControllerService
+from IPython.kernel.multiengine import IMultiEngine
+from IPython.kernel.tests.multienginetest import IFullSynchronousMultiEngineTestCase
+from IPython.kernel.multienginefc import IFCSynchronousMultiEngine
+from IPython.kernel import multiengine as me
+from IPython.kernel.clientconnector import ClientConnector
+from IPython.kernel.parallelfunction import ParallelFunction
+from IPython.kernel.error import CompositeError
+from IPython.kernel.util import printer
 
-    from IPython.kernel.fcutil import Tub, UnauthenticatedTub
 
-    from IPython.testing.util import DeferredTestCase
-    from IPython.kernel.controllerservice import ControllerService
-    from IPython.kernel.multiengine import IMultiEngine
-    from IPython.kernel.tests.multienginetest import IFullSynchronousMultiEngineTestCase
-    from IPython.kernel.multienginefc import IFCSynchronousMultiEngine
-    from IPython.kernel import multiengine as me
-    from IPython.kernel.clientconnector import ClientConnector
-    from IPython.kernel.parallelfunction import ParallelFunction
-    from IPython.kernel.error import CompositeError
-    from IPython.kernel.util import printer
-except ImportError:
-    import nose
-    raise nose.SkipTest("This test requires zope.interface, Twisted and Foolscap")
-    
 def _raise_it(f):
     try:
         f.raiseException()
     except CompositeError, e:
         e.raise_exception()
 
 
 class FullSynchronousMultiEngineTestCase(DeferredTestCase, IFullSynchronousMultiEngineTestCase):
 
     def setUp(self):
     
         self.engines = []
             
         self.controller = ControllerService()
         self.controller.startService()
         self.imultiengine = IMultiEngine(self.controller)
         self.mec_referenceable = IFCSynchronousMultiEngine(self.imultiengine)
 
         self.controller_tub = Tub()
         self.controller_tub.listenOn('tcp:10105:interface=127.0.0.1')
         self.controller_tub.setLocation('127.0.0.1:10105')
     
         furl = self.controller_tub.registerReference(self.mec_referenceable)
         self.controller_tub.startService()
     
         self.client_tub = ClientConnector()
         d = self.client_tub.get_multiengine_client(furl)
         d.addCallback(self.handle_got_client)
         return d
     
     def handle_got_client(self, client):
         self.multiengine = client
 
     def tearDown(self):
         dlist = []
         # Shut down the multiengine client
         d = self.client_tub.tub.stopService()
         dlist.append(d)
         # Shut down the engines
         for e in self.engines:
             e.stopService()
         # Shut down the controller
         d = self.controller_tub.stopService()
         d.addBoth(lambda _: self.controller.stopService())
         dlist.append(d)
         return defer.DeferredList(dlist)
 
     def test_mapper(self):
         self.addEngine(4)
         m = self.multiengine.mapper()
         self.assertEquals(m.multiengine,self.multiengine)
         self.assertEquals(m.dist,'b')
         self.assertEquals(m.targets,'all')
         self.assertEquals(m.block,True)
     
     def test_map_default(self):
         self.addEngine(4)
         m = self.multiengine.mapper()
         d = m.map(lambda x: 2*x, range(10))
         d.addCallback(lambda r: self.assertEquals(r,[2*x for x in range(10)]))
         d.addCallback(lambda _: self.multiengine.map(lambda x: 2*x, range(10)))
         d.addCallback(lambda r: self.assertEquals(r,[2*x for x in range(10)]))
         return d
     
     def test_map_noblock(self):
         self.addEngine(4)
         m = self.multiengine.mapper(block=False)
         d = m.map(lambda x: 2*x, range(10))
         d.addCallback(lambda did: self.multiengine.get_pending_deferred(did, True))
         d.addCallback(lambda r: self.assertEquals(r,[2*x for x in range(10)]))
         return d
             
     def test_mapper_fail(self):
         self.addEngine(4)
         m = self.multiengine.mapper()
         d = m.map(lambda x: 1/0, range(10))
         d.addBoth(lambda f: self.assertRaises(ZeroDivisionError, _raise_it, f))
         return d
     
     def test_parallel(self):
         self.addEngine(4)
         p = self.multiengine.parallel()
         self.assert_(isinstance(p, ParallelFunction))
         @p
         def f(x): return 2*x
         d = f(range(10))
         d.addCallback(lambda r: self.assertEquals(r,[2*x for x in range(10)]))
         return d
     
     def test_parallel_noblock(self):
         self.addEngine(1)
         p = self.multiengine.parallel(block=False)
         self.assert_(isinstance(p, ParallelFunction))
         @p
         def f(x): return 2*x
         d = f(range(10))
         d.addCallback(lambda did: self.multiengine.get_pending_deferred(did, True))
         d.addCallback(lambda r: self.assertEquals(r,[2*x for x in range(10)]))
         return d
     
     def test_parallel_fail(self):
         self.addEngine(4)
         p = self.multiengine.parallel()
         self.assert_(isinstance(p, ParallelFunction))
         @p
         def f(x): return 1/0
         d = f(range(10))
         d.addBoth(lambda f: self.assertRaises(ZeroDivisionError, _raise_it, f))
         return d
  No newline at end of file

IPython/kernel/tests/test_newserialized.py

@@ -1,102 +1,102 b''
 # encoding: utf-8
 
 """This file contains unittests for the shell.py module."""
 
 __docformat__ = "restructuredtext en"
 
 #-----------------------------------------------------------------------------
 #  Copyright (C) 2008  The IPython Development Team
 #
 #  Distributed under the terms of the BSD License.  The full license is in
 #  the file COPYING, distributed as part of this software.
 #-----------------------------------------------------------------------------
 
 #-----------------------------------------------------------------------------
 # Imports
 #-----------------------------------------------------------------------------
 
-try:
-    import zope.interface as zi
-    from twisted.trial import unittest
-    from IPython.testing.util import DeferredTestCase
+# Tell nose to skip this module
+__test__ = {}
+
+import zope.interface as zi
+from twisted.trial import unittest
+from IPython.testing.util import DeferredTestCase
+
+from IPython.kernel.newserialized import \
+    ISerialized, \
+    IUnSerialized, \
+    Serialized, \
+    UnSerialized, \
+    SerializeIt, \
+    UnSerializeIt
 
-    from IPython.kernel.newserialized import \
-        ISerialized, \
-        IUnSerialized, \
-        Serialized, \
-        UnSerialized, \
-        SerializeIt, \
-        UnSerializeIt
-except ImportError:
-    import nose
-    raise nose.SkipTest("This test requires zope.interface, Twisted and Foolscap")
 
 #-----------------------------------------------------------------------------
 # Tests
 #-----------------------------------------------------------------------------
 
 class SerializedTestCase(unittest.TestCase):
 
     def setUp(self):
         pass
     
     def tearDown(self):
         pass
     
     def testSerializedInterfaces(self):
 
         us = UnSerialized({'a':10, 'b':range(10)})
         s = ISerialized(us)
         uss = IUnSerialized(s)
         self.assert_(ISerialized.providedBy(s))
         self.assert_(IUnSerialized.providedBy(us))
         self.assert_(IUnSerialized.providedBy(uss))
         for m in list(ISerialized):
             self.assert_(hasattr(s, m))
         for m in list(IUnSerialized):
             self.assert_(hasattr(us, m))
         for m in list(IUnSerialized):
             self.assert_(hasattr(uss, m))
 
     def testPickleSerialized(self):
         obj = {'a':1.45345, 'b':'asdfsdf', 'c':10000L}
         original = UnSerialized(obj)
         originalSer = ISerialized(original)
         firstData = originalSer.getData()
         firstTD = originalSer.getTypeDescriptor()
         firstMD = originalSer.getMetadata()
         self.assert_(firstTD == 'pickle')
         self.assert_(firstMD == {})
         unSerialized = IUnSerialized(originalSer)
         secondObj = unSerialized.getObject()
         for k, v in secondObj.iteritems():
             self.assert_(obj[k] == v)
         secondSer = ISerialized(UnSerialized(secondObj))
         self.assert_(firstData == secondSer.getData())
         self.assert_(firstTD == secondSer.getTypeDescriptor() )
         self.assert_(firstMD == secondSer.getMetadata())
     
     def testNDArraySerialized(self):
         try:
             import numpy
         except ImportError:
             pass
         else:
             a = numpy.linspace(0.0, 1.0, 1000)
             unSer1 = UnSerialized(a)
             ser1 = ISerialized(unSer1)
             td = ser1.getTypeDescriptor()
             self.assert_(td == 'ndarray')
             md = ser1.getMetadata()
             self.assert_(md['shape'] == a.shape)
             self.assert_(md['dtype'] == a.dtype.str)
             buff = ser1.getData()
             self.assert_(buff == numpy.getbuffer(a))
             s = Serialized(buff, td, md)
             us = IUnSerialized(s)
             final = us.getObject()
             self.assert_(numpy.getbuffer(a) == numpy.getbuffer(final))
             self.assert_(a.dtype.str == final.dtype.str)
             self.assert_(a.shape == final.shape)
         
         

IPython/kernel/tests/test_pendingdeferred.py

@@ -1,186 +1,186 b''
 #!/usr/bin/env python
 # encoding: utf-8
 
 """Tests for pendingdeferred.py"""
 
 __docformat__ = "restructuredtext en"
 
 #-------------------------------------------------------------------------------
 #  Copyright (C) 2008  The IPython Development Team
 #
 #  Distributed under the terms of the BSD License.  The full license is in
 #  the file COPYING, distributed as part of this software.
 #-------------------------------------------------------------------------------
 
 #-------------------------------------------------------------------------------
 # Imports
 #-------------------------------------------------------------------------------
 
-try:
-    from twisted.internet import defer
-    from twisted.python import failure
-
-    from IPython.testing.util import DeferredTestCase
-    import IPython.kernel.pendingdeferred as pd
-    from IPython.kernel import error
-    from IPython.kernel.util import printer
-except ImportError:
-    import nose
-    raise nose.SkipTest("This test requires zope.interface, Twisted and Foolscap")
-    
+# Tell nose to skip this module
+__test__ = {}
+
+from twisted.internet import defer
+from twisted.python import failure
+
+from IPython.testing.util import DeferredTestCase
+import IPython.kernel.pendingdeferred as pd
+from IPython.kernel import error
+from IPython.kernel.util import printer
+
+
 class Foo(object):
 
     def bar(self, bahz):
         return defer.succeed('blahblah: %s' % bahz)
 
 class TwoPhaseFoo(pd.PendingDeferredManager):
 
     def __init__(self, foo):
         self.foo = foo
         pd.PendingDeferredManager.__init__(self)
 
     @pd.two_phase
     def bar(self, bahz):
         return self.foo.bar(bahz)
 
 class PendingDeferredManagerTest(DeferredTestCase):
 
     def setUp(self):
         self.pdm = pd.PendingDeferredManager()
     
     def tearDown(self):
         pass
 
     def testBasic(self):
         dDict = {}
         # Create 10 deferreds and save them
         for i in range(10):
             d = defer.Deferred()
             did = self.pdm.save_pending_deferred(d)
             dDict[did] = d
         # Make sure they are begin saved
         for k in dDict.keys():
             self.assert_(self.pdm.quick_has_id(k))
         # Get the pending deferred (block=True), then callback with 'foo' and compare
         for did in dDict.keys()[0:5]:
             d = self.pdm.get_pending_deferred(did,block=True)
             dDict[did].callback('foo')
             d.addCallback(lambda r: self.assert_(r=='foo'))
         # Get the pending deferreds with (block=False) and make sure ResultNotCompleted is raised
         for did in dDict.keys()[5:10]:
             d = self.pdm.get_pending_deferred(did,block=False)
             d.addErrback(lambda f: self.assertRaises(error.ResultNotCompleted, f.raiseException))
         # Now callback the last 5, get them and compare.
         for did in dDict.keys()[5:10]:
             dDict[did].callback('foo')
             d = self.pdm.get_pending_deferred(did,block=False)
             d.addCallback(lambda r: self.assert_(r=='foo'))
 
     def test_save_then_delete(self):
         d = defer.Deferred()
         did = self.pdm.save_pending_deferred(d)
         self.assert_(self.pdm.quick_has_id(did))
         self.pdm.delete_pending_deferred(did)
         self.assert_(not self.pdm.quick_has_id(did))
 
     def test_save_get_delete(self):
         d = defer.Deferred()
         did = self.pdm.save_pending_deferred(d)
         d2 = self.pdm.get_pending_deferred(did,True)
         d2.addErrback(lambda f: self.assertRaises(error.AbortedPendingDeferredError, f.raiseException))
         self.pdm.delete_pending_deferred(did)
         return d2
 
     def test_double_get(self):
         d = defer.Deferred()
         did = self.pdm.save_pending_deferred(d)
         d2 = self.pdm.get_pending_deferred(did,True)
         d3 = self.pdm.get_pending_deferred(did,True)
         d3.addErrback(lambda f: self.assertRaises(error.InvalidDeferredID, f.raiseException))
 
     def test_get_after_callback(self):
         d = defer.Deferred()
         did = self.pdm.save_pending_deferred(d)
         d.callback('foo')
         d2 = self.pdm.get_pending_deferred(did,True)
         d2.addCallback(lambda r: self.assertEquals(r,'foo'))
         self.assert_(not self.pdm.quick_has_id(did))
 
     def test_get_before_callback(self):
         d = defer.Deferred()
         did = self.pdm.save_pending_deferred(d)
         d2 = self.pdm.get_pending_deferred(did,True)
         d.callback('foo')
         d2.addCallback(lambda r: self.assertEquals(r,'foo'))
         self.assert_(not self.pdm.quick_has_id(did))
         d = defer.Deferred()
         did = self.pdm.save_pending_deferred(d)
         d2 = self.pdm.get_pending_deferred(did,True)
         d2.addCallback(lambda r: self.assertEquals(r,'foo'))
         d.callback('foo')
         self.assert_(not self.pdm.quick_has_id(did))
 
     def test_get_after_errback(self):
         class MyError(Exception):
             pass
         d = defer.Deferred()
         did = self.pdm.save_pending_deferred(d)
         d.errback(failure.Failure(MyError('foo')))
         d2 = self.pdm.get_pending_deferred(did,True)
         d2.addErrback(lambda f: self.assertRaises(MyError, f.raiseException))
         self.assert_(not self.pdm.quick_has_id(did))
 
     def test_get_before_errback(self):
         class MyError(Exception):
             pass
         d = defer.Deferred()
         did = self.pdm.save_pending_deferred(d)
         d2 = self.pdm.get_pending_deferred(did,True)
         d.errback(failure.Failure(MyError('foo')))
         d2.addErrback(lambda f: self.assertRaises(MyError, f.raiseException))
         self.assert_(not self.pdm.quick_has_id(did))
         d = defer.Deferred()
         did = self.pdm.save_pending_deferred(d)
         d2 = self.pdm.get_pending_deferred(did,True)
         d2.addErrback(lambda f: self.assertRaises(MyError, f.raiseException))
         d.errback(failure.Failure(MyError('foo')))
         self.assert_(not self.pdm.quick_has_id(did))
     
     def test_noresult_noblock(self):
         d = defer.Deferred()
         did = self.pdm.save_pending_deferred(d)
         d2 = self.pdm.get_pending_deferred(did,False)
         d2.addErrback(lambda f: self.assertRaises(error.ResultNotCompleted, f.raiseException))
 
     def test_with_callbacks(self):
         d = defer.Deferred()
         d.addCallback(lambda r: r+' foo')
         d.addCallback(lambda r: r+' bar')
         did = self.pdm.save_pending_deferred(d)
         d2 = self.pdm.get_pending_deferred(did,True)
         d.callback('bam')
         d2.addCallback(lambda r: self.assertEquals(r,'bam foo bar'))
 
     def test_with_errbacks(self):
         class MyError(Exception):
             pass
         d = defer.Deferred()
         d.addCallback(lambda r: 'foo')
         d.addErrback(lambda f: 'caught error')
         did = self.pdm.save_pending_deferred(d)
         d2 = self.pdm.get_pending_deferred(did,True)
         d.errback(failure.Failure(MyError('bam')))
         d2.addErrback(lambda f: self.assertRaises(MyError, f.raiseException))
 
     def test_nested_deferreds(self):
         d = defer.Deferred()
         d2 = defer.Deferred()
         d.addCallback(lambda r: d2)
         did = self.pdm.save_pending_deferred(d)
         d.callback('foo')
         d3 = self.pdm.get_pending_deferred(did,False)
         d3.addErrback(lambda f: self.assertRaises(error.ResultNotCompleted, f.raiseException))
         d2.callback('bar')
         d3 = self.pdm.get_pending_deferred(did,False)
         d3.addCallback(lambda r: self.assertEquals(r,'bar'))
 

IPython/kernel/tests/test_task.py

@@ -1,51 +1,51 b''
 # encoding: utf-8
 
 """This file contains unittests for the kernel.task.py module."""
 
 __docformat__ = "restructuredtext en"
 
 #-------------------------------------------------------------------------------
 #  Copyright (C) 2008  The IPython Development Team
 #
 #  Distributed under the terms of the BSD License.  The full license is in
 #  the file COPYING, distributed as part of this software.
 #-------------------------------------------------------------------------------
 
 #-------------------------------------------------------------------------------
 # Imports
 #-------------------------------------------------------------------------------
 
-try:
-    import time
-
-    from twisted.internet import defer
-    from twisted.trial import unittest
-
-    from IPython.kernel import task, controllerservice as cs, engineservice as es
-    from IPython.kernel.multiengine import IMultiEngine
-    from IPython.testing.util import DeferredTestCase
-    from IPython.kernel.tests.tasktest import ITaskControllerTestCase
-except ImportError:
-    import nose
-    raise nose.SkipTest("This test requires zope.interface, Twisted and Foolscap")
+# Tell nose to skip this module
+__test__ = {}
+
+import time
+
+from twisted.internet import defer
+from twisted.trial import unittest
+
+from IPython.kernel import task, controllerservice as cs, engineservice as es
+from IPython.kernel.multiengine import IMultiEngine
+from IPython.testing.util import DeferredTestCase
+from IPython.kernel.tests.tasktest import ITaskControllerTestCase
+
 
 #-------------------------------------------------------------------------------
 # Tests
 #-------------------------------------------------------------------------------
 
 class BasicTaskControllerTestCase(DeferredTestCase, ITaskControllerTestCase):
 
     def setUp(self):
         self.controller  = cs.ControllerService()
         self.controller.startService()
         self.multiengine = IMultiEngine(self.controller)
         self.tc = task.ITaskController(self.controller)
         self.tc.failurePenalty = 0
         self.engines=[]
     
     def tearDown(self):
         self.controller.stopService()
         for e in self.engines:
             e.stopService()
 
 

IPython/kernel/tests/test_taskfc.py

@@ -1,162 +1,161 b''
 #!/usr/bin/env python
 # encoding: utf-8
 
 __docformat__ = "restructuredtext en"
 
 #-------------------------------------------------------------------------------
 #  Copyright (C) 2008  The IPython Development Team
 #
 #  Distributed under the terms of the BSD License.  The full license is in
 #  the file COPYING, distributed as part of this software.
 #-------------------------------------------------------------------------------
 
 #-------------------------------------------------------------------------------
 # Imports
 #-------------------------------------------------------------------------------
 
-try:
-    import time
+# Tell nose to skip this module
+__test__ = {}
 
-    from twisted.internet import defer, reactor
+import time
 
-    from IPython.kernel.fcutil import Tub, UnauthenticatedTub
+from twisted.internet import defer, reactor
 
-    from IPython.kernel import task as taskmodule
-    from IPython.kernel import controllerservice as cs
-    import IPython.kernel.multiengine as me
-    from IPython.testing.util import DeferredTestCase
-    from IPython.kernel.multienginefc import IFCSynchronousMultiEngine
-    from IPython.kernel.taskfc import IFCTaskController
-    from IPython.kernel.util import printer
-    from IPython.kernel.tests.tasktest import ITaskControllerTestCase
-    from IPython.kernel.clientconnector import ClientConnector
-    from IPython.kernel.error import CompositeError
-    from IPython.kernel.parallelfunction import ParallelFunction
-except ImportError:
-    import nose
-    raise nose.SkipTest("This test requires zope.interface, Twisted and Foolscap")
+from IPython.kernel.fcutil import Tub, UnauthenticatedTub
+
+from IPython.kernel import task as taskmodule
+from IPython.kernel import controllerservice as cs
+import IPython.kernel.multiengine as me
+from IPython.testing.util import DeferredTestCase
+from IPython.kernel.multienginefc import IFCSynchronousMultiEngine
+from IPython.kernel.taskfc import IFCTaskController
+from IPython.kernel.util import printer
+from IPython.kernel.tests.tasktest import ITaskControllerTestCase
+from IPython.kernel.clientconnector import ClientConnector
+from IPython.kernel.error import CompositeError
+from IPython.kernel.parallelfunction import ParallelFunction
 
 
 #-------------------------------------------------------------------------------
 # Tests
 #-------------------------------------------------------------------------------
 
 def _raise_it(f):
     try:
         f.raiseException()
     except CompositeError, e:
         e.raise_exception()
 
 class TaskTest(DeferredTestCase, ITaskControllerTestCase):
 
     def setUp(self):
     
         self.engines = []
             
         self.controller = cs.ControllerService()
         self.controller.startService()
         self.imultiengine = me.IMultiEngine(self.controller)
         self.itc = taskmodule.ITaskController(self.controller)
         self.itc.failurePenalty = 0
     
         self.mec_referenceable = IFCSynchronousMultiEngine(self.imultiengine)
         self.tc_referenceable = IFCTaskController(self.itc)
     
         self.controller_tub = Tub()
         self.controller_tub.listenOn('tcp:10105:interface=127.0.0.1')
         self.controller_tub.setLocation('127.0.0.1:10105')
     
         mec_furl = self.controller_tub.registerReference(self.mec_referenceable)
         tc_furl = self.controller_tub.registerReference(self.tc_referenceable)
         self.controller_tub.startService()
     
         self.client_tub = ClientConnector()
         d = self.client_tub.get_multiengine_client(mec_furl)
         d.addCallback(self.handle_mec_client)
         d.addCallback(lambda _: self.client_tub.get_task_client(tc_furl))
         d.addCallback(self.handle_tc_client)
         return d
     
     def handle_mec_client(self, client):
         self.multiengine = client
 
     def handle_tc_client(self, client):
         self.tc = client
 
     def tearDown(self):
         dlist = []
         # Shut down the multiengine client
         d = self.client_tub.tub.stopService()
         dlist.append(d)
         # Shut down the engines
         for e in self.engines:
             e.stopService()
         # Shut down the controller
         d = self.controller_tub.stopService()
         d.addBoth(lambda _: self.controller.stopService())
         dlist.append(d)
         return defer.DeferredList(dlist)
     
     def test_mapper(self):
         self.addEngine(1)
         m = self.tc.mapper()
         self.assertEquals(m.task_controller,self.tc)
         self.assertEquals(m.clear_before,False)
         self.assertEquals(m.clear_after,False)
         self.assertEquals(m.retries,0)
         self.assertEquals(m.recovery_task,None)
         self.assertEquals(m.depend,None)
         self.assertEquals(m.block,True)
     
     def test_map_default(self):
         self.addEngine(1)
         m = self.tc.mapper()
         d = m.map(lambda x: 2*x, range(10))
         d.addCallback(lambda r: self.assertEquals(r,[2*x for x in range(10)]))
         d.addCallback(lambda _: self.tc.map(lambda x: 2*x, range(10)))
         d.addCallback(lambda r: self.assertEquals(r,[2*x for x in range(10)]))
         return d
     
     def test_map_noblock(self):
         self.addEngine(1)
         m = self.tc.mapper(block=False)
         d = m.map(lambda x: 2*x, range(10))
         d.addCallback(lambda r: self.assertEquals(r,[x for x in range(10)]))
         return d
             
     def test_mapper_fail(self):
         self.addEngine(1)
         m = self.tc.mapper()
         d = m.map(lambda x: 1/0, range(10))
         d.addBoth(lambda f: self.assertRaises(ZeroDivisionError, _raise_it, f))
         return d
     
     def test_parallel(self):
         self.addEngine(1)
         p = self.tc.parallel()
         self.assert_(isinstance(p, ParallelFunction))
         @p
         def f(x): return 2*x
         d = f(range(10))
         d.addCallback(lambda r: self.assertEquals(r,[2*x for x in range(10)]))
         return d
     
     def test_parallel_noblock(self):
         self.addEngine(1)
         p = self.tc.parallel(block=False)
         self.assert_(isinstance(p, ParallelFunction))
         @p
         def f(x): return 2*x
         d = f(range(10))
         d.addCallback(lambda r: self.assertEquals(r,[x for x in range(10)]))
         return d
     
     def test_parallel_fail(self):
         self.addEngine(1)
         p = self.tc.parallel()
         self.assert_(isinstance(p, ParallelFunction))
         @p
         def f(x): return 1/0
         d = f(range(10))
         d.addBoth(lambda f: self.assertRaises(ZeroDivisionError, _raise_it, f))
         return d
  No newline at end of file

IPython/kernel/tests/test_twistedutil.py

@@ -1,48 +1,51 b''
 #!/usr/bin/env python
 # encoding: utf-8
 
 #-----------------------------------------------------------------------------
 #  Copyright (C) 2008  The IPython Development Team
 #
 #  Distributed under the terms of the BSD License.  The full license is in
 #  the file COPYING, distributed as part of this software.
 #-----------------------------------------------------------------------------
 
 #-----------------------------------------------------------------------------
 # Imports
 #-----------------------------------------------------------------------------
 
+# Tell nose to skip this module
+__test__ = {}
+
 import tempfile
 import os, sys
 
 from twisted.internet import reactor
 from twisted.trial import unittest
 
 from IPython.kernel.error import FileTimeoutError
 from IPython.kernel.twistedutil import wait_for_file
 
 #-----------------------------------------------------------------------------
 # Tests
 #-----------------------------------------------------------------------------
 
 class TestWaitForFile(unittest.TestCase):
 
     def test_delay(self):
         filename = tempfile.mktemp()
         def _create_file():
             open(filename,'w').write('####')
         dcall = reactor.callLater(0.5, _create_file)
         d = wait_for_file(filename,delay=0.1)
         d.addCallback(lambda r: self.assert_(r))
         def _cancel_dcall(r):
             if dcall.active():
                 dcall.cancel()
         d.addCallback(_cancel_dcall)
         return d
     
     def test_timeout(self):
         filename = tempfile.mktemp()
         d = wait_for_file(filename,delay=0.1,max_tries=1)
         d.addErrback(lambda f: self.assertRaises(FileTimeoutError,f.raiseException))
         return d
         
  No newline at end of file

IPython/testing/decorators.py

@@ -1,254 +1,254 b''
 """Decorators for labeling test objects.
 
 Decorators that merely return a modified version of the original function
 object are straightforward.  Decorators that return a new function object need
 to use nose.tools.make_decorator(original_function)(decorator) in returning the
 decorator, in order to preserve metadata such as function name, setup and
 teardown functions and so on - see nose.tools for more information.
 
 This module provides a set of useful decorators meant to be ready to use in
 your own tests.  See the bottom of the file for the ready-made ones, and if you
 find yourself writing a new one that may be of generic use, add it here.
 
 NOTE: This file contains IPython-specific decorators and imports the
 numpy.testing.decorators file, which we've copied verbatim.  Any of our own
 code will be added at the bottom if we end up extending this.
 """
 
 # Stdlib imports
 import inspect
 import sys
 
 # Third-party imports
 
 # This is Michele Simionato's decorator module, also kept verbatim.
 from decorator_msim import decorator, update_wrapper
 
 # Grab the numpy-specific decorators which we keep in a file that we
 # occasionally update from upstream: decorators_numpy.py is an IDENTICAL copy
 # of numpy.testing.decorators.
 from decorators_numpy import *
 
 ##############################################################################
 # Local code begins
 
 # Utility functions
 
 def apply_wrapper(wrapper,func):
     """Apply a wrapper to a function for decoration.
 
     This mixes Michele Simionato's decorator tool with nose's make_decorator,
     to apply a wrapper in a decorator so that all nose attributes, as well as
     function signature and other properties, survive the decoration cleanly.
     This will ensure that wrapped functions can still be well introspected via
     IPython, for example.
     """
     import nose.tools
 
     return decorator(wrapper,nose.tools.make_decorator(func)(wrapper))
 
 
 def make_label_dec(label,ds=None):
     """Factory function to create a decorator that applies one or more labels.
 
     :Parameters:
       label : string or sequence
       One or more labels that will be applied by the decorator to the functions
     it decorates.  Labels are attributes of the decorated function with their
     value set to True.
 
     :Keywords:
       ds : string
       An optional docstring for the resulting decorator.  If not given, a
       default docstring is auto-generated.
 
     :Returns:
       A decorator.
 
     :Examples:
 
     A simple labeling decorator:
     >>> slow = make_label_dec('slow')
     >>> print slow.__doc__
     Labels a test as 'slow'.
 
     And one that uses multiple labels and a custom docstring:
     >>> rare = make_label_dec(['slow','hard'],
     ... "Mix labels 'slow' and 'hard' for rare tests.")
     >>> print rare.__doc__
     Mix labels 'slow' and 'hard' for rare tests.
 
     Now, let's test using this one:
     >>> @rare
     ... def f(): pass
     ...
     >>>
     >>> f.slow
     True
     >>> f.hard
     True
     """
 
     if isinstance(label,basestring):
         labels = [label]
     else:
         labels = label
         
     # Validate that the given label(s) are OK for use in setattr() by doing a
     # dry run on a dummy function.
     tmp = lambda : None
     for label in labels:
         setattr(tmp,label,True)
 
     # This is the actual decorator we'll return
     def decor(f):
         for label in labels:
             setattr(f,label,True)
         return f
     
     # Apply the user's docstring, or autogenerate a basic one
     if ds is None:
         ds = "Labels a test as %r." % label
     decor.__doc__ = ds
     
     return decor
 
 
 # Inspired by numpy's skipif, but uses the full apply_wrapper utility to
 # preserve function metadata better and allows the skip condition to be a
 # callable.
 def skipif(skip_condition, msg=None):
     ''' Make function raise SkipTest exception if skip_condition is true
 
     Parameters
     ----------
     skip_condition : bool or callable. 
- 	Flag to determine whether to skip test.  If the condition is a 
- 	callable, it is used at runtime to dynamically make the decision.  This 
- 	is useful for tests that may require costly imports, to delay the cost 
- 	until the test suite is actually executed.        
+    Flag to determine whether to skip test.  If the condition is a 
+    callable, it is used at runtime to dynamically make the decision.  This 
+    is useful for tests that may require costly imports, to delay the cost 
+    until the test suite is actually executed.        
     msg : string
         Message to give on raising a SkipTest exception
 
    Returns
    -------
    decorator : function
        Decorator, which, when applied to a function, causes SkipTest
        to be raised when the skip_condition was True, and the function
        to be called normally otherwise.
 
     Notes
     -----
     You will see from the code that we had to further decorate the
     decorator with the nose.tools.make_decorator function in order to
     transmit function name, and various other metadata.
     '''
 
     def skip_decorator(f):
         # Local import to avoid a hard nose dependency and only incur the 
         # import time overhead at actual test-time. 
         import nose
 
         # Allow for both boolean or callable skip conditions.
         if callable(skip_condition):
             skip_val = lambda : skip_condition()
         else:
             skip_val = lambda : skip_condition
 
         def get_msg(func,msg=None):
             """Skip message with information about function being skipped."""
             if msg is None: out = 'Test skipped due to test condition.'
             else: out = msg
             return "Skipping test: %s. %s" % (func.__name__,out)
 
         # We need to define *two* skippers because Python doesn't allow both
         # return with value and yield inside the same function.
         def skipper_func(*args, **kwargs):
             """Skipper for normal test functions."""
             if skip_val():
                 raise nose.SkipTest(get_msg(f,msg))
             else:
                 return f(*args, **kwargs) 
 
         def skipper_gen(*args, **kwargs):
             """Skipper for test generators."""
             if skip_val():
                 raise nose.SkipTest(get_msg(f,msg))
             else:
                 for x in f(*args, **kwargs):
                     yield x
 
         # Choose the right skipper to use when building the actual generator.
         if nose.util.isgenerator(f):
             skipper = skipper_gen
         else:
             skipper = skipper_func
             
         return nose.tools.make_decorator(f)(skipper)
 
     return skip_decorator
 
 # A version with the condition set to true, common case just to attacha message
 # to a skip decorator
 def skip(msg=None):
     """Decorator factory - mark a test function for skipping from test suite.
 
     :Parameters:
       msg : string
         Optional message to be added.
 
     :Returns:
        decorator : function
          Decorator, which, when applied to a function, causes SkipTest
          to be raised, with the optional message added.
       """
 
     return skipif(True,msg)
 
 
 #-----------------------------------------------------------------------------
 # Utility functions for decorators
 def numpy_not_available():
     """Can numpy be imported?  Returns true if numpy does NOT import.
 
     This is used to make a decorator to skip tests that require numpy to be
     available, but delay the 'import numpy' to test execution time.
     """
     try:
         import numpy
         np_not_avail = False
     except ImportError:
         np_not_avail = True
 
     return np_not_avail
 
 #-----------------------------------------------------------------------------
 # Decorators for public use
 
 skip_doctest = make_label_dec('skip_doctest',
     """Decorator - mark a function or method for skipping its doctest.
 
     This decorator allows you to mark a function whose docstring you wish to
     omit from testing, while preserving the docstring for introspection, help,
     etc.""")                              
 
 # Decorators to skip certain tests on specific platforms.
 skip_win32 = skipif(sys.platform == 'win32',
                     "This test does not run under Windows")
 skip_linux = skipif(sys.platform == 'linux2',
                     "This test does not run under Linux")
 skip_osx = skipif(sys.platform == 'darwin',"This test does not run under OS X")
 
 
 # Decorators to skip tests if not on specific platforms.
 skip_if_not_win32 = skipif(sys.platform != 'win32',
                            "This test only runs under Windows")
 skip_if_not_linux = skipif(sys.platform != 'linux2',
                            "This test only runs under Linux")
 skip_if_not_osx = skipif(sys.platform != 'darwin',
                          "This test only runs under OSX")
 
 # Other skip decorators
 skipif_not_numpy = skipif(numpy_not_available,"This test requires numpy")
 
 skipknownfailure = skip('This test is known to fail')