##// END OF EJS Templates
Multiple improvements to tab completion....
Multiple improvements to tab completion. I refactored the API quite a bit, to retain readline compatibility but make it more independent of readline. There's still more to do in cleaning up our init_readline() method, but now the completer objects have separate rlcomplete() and complete() methods. The former uses the quirky readline API with a state flag, while the latter is stateless, takes only text information, and is more suitable for GUIs and other frontends to call programatically. Made other minor fixes to ensure the test suite passes in full. While all this code is a bit messy, we're getting in the direction of the APIs we need in the long run.

File last commit:

r2517:8185e15c
r2839:8cff4913
Show More
test_multienginefc.py
146 lines | 5.0 KiB | text/x-python | PythonLexer
/ IPython / kernel / tests / test_multienginefc.py
Brian E Granger
This is a manual merge of certain things in the ipython1-dev branch, revision 46, into the main ...
r1234 #!/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
#-------------------------------------------------------------------------------
Brian Granger
Fixing misc testing related things.
r1960 # 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
Brian Granger
Fixed bugs in IPython.kernel....
r2517 from IPython.kernel.clientconnector import AsyncClientConnector
Brian Granger
Fixing misc testing related things.
r1960 from IPython.kernel.parallelfunction import ParallelFunction
from IPython.kernel.error import CompositeError
from IPython.kernel.util import printer
Brian Granger
Removed some tabs and added a new way of skipping tests that have...
r1555 def _raise_it(f):
try:
f.raiseException()
except CompositeError, e:
e.raise_exception()
Brian Granger
Fixed bugs in IPython.kernel....
r2517 class FullSynchronousMultiEngineTestCase(
DeferredTestCase, IFullSynchronousMultiEngineTestCase):
Brian Granger
Removed some tabs and added a new way of skipping tests that have...
r1555
def setUp(self):
Brian Granger
Fixed bugs in IPython.kernel....
r2517
Brian Granger
Removed some tabs and added a new way of skipping tests that have...
r1555 self.engines = []
Brian Granger
Fixed bugs in IPython.kernel....
r2517
Brian Granger
Removed some tabs and added a new way of skipping tests that have...
r1555 self.controller = ControllerService()
self.controller.startService()
self.imultiengine = IMultiEngine(self.controller)
self.mec_referenceable = IFCSynchronousMultiEngine(self.imultiengine)
self.controller_tub = Tub()
Brian Granger
Fixed bugs in IPython.kernel....
r2517 self.controller_tub.listenOn('tcp:10111:interface=127.0.0.1')
self.controller_tub.setLocation('127.0.0.1:10111')
Brian Granger
Removed some tabs and added a new way of skipping tests that have...
r1555 furl = self.controller_tub.registerReference(self.mec_referenceable)
self.controller_tub.startService()
Brian Granger
Fixed bugs in IPython.kernel....
r2517
self.client_tub = AsyncClientConnector()
d = self.client_tub.get_multiengine_client(furl_or_file=furl)
Brian Granger
Removed some tabs and added a new way of skipping tests that have...
r1555 d.addCallback(self.handle_got_client)
return d
Brian Granger
Fixed bugs in IPython.kernel....
r2517
Brian Granger
Removed some tabs and added a new way of skipping tests that have...
r1555 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)
Brian E Granger
Fixing more tests and examples after the task, map and @parallel work.
r1396
Brian Granger
Removed some tabs and added a new way of skipping tests that have...
r1555 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)
Brian Granger
Fixed bugs in IPython.kernel....
r2517
Brian Granger
Removed some tabs and added a new way of skipping tests that have...
r1555 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
Brian Granger
Fixed bugs in IPython.kernel....
r2517
Brian Granger
Removed some tabs and added a new way of skipping tests that have...
r1555 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
Brian Granger
Fixed bugs in IPython.kernel....
r2517
Brian Granger
Removed some tabs and added a new way of skipping tests that have...
r1555 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
Brian Granger
Fixed bugs in IPython.kernel....
r2517
Brian Granger
Removed some tabs and added a new way of skipping tests that have...
r1555 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
Brian Granger
Fixed bugs in IPython.kernel....
r2517
Brian Granger
Removed some tabs and added a new way of skipping tests that have...
r1555 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
Brian Granger
Fixed bugs in IPython.kernel....
r2517
Brian Granger
Removed some tabs and added a new way of skipping tests that have...
r1555 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))
Fernando Perez
Disable completely two sets of Twisted tests so the suite runs....
r2420 return d
Brian Granger
Fixed bugs in IPython.kernel....
r2517