##// END OF EJS Templates
Merge remote branch 'minrk/htmlfix' into trunk....
Merge remote branch 'minrk/htmlfix' into trunk. This branch implements a number of improvements to the HTML save capabilities of the Qt console, and received extensive reviews. A short summary follows, see the pull request page for full details, at http://github.com/ipython/ipython/pull/170. Some small issues in the HTML code I noticed when I started playing with it. * only rich backends support toHtml, so the html/xhtml exports failed * modules were imported inside functions * relpath in image_tag was determined in platform-dependent way * save dialog strictly enforced non-standard '.htm' file extension * when selecting external PNG, the _files dir was always created, regardless of whether there were any images Fixes in this commit: * export options do not appear in non-rich widgets * module imports all at the top * relpath uses platform independent os.path * dialog uses standard '.html' by default, but allows any extension * no _files dir is created if no images are to be exported Closes gh-170 (pull request).

File last commit:

r2517:8185e15c
r3177:35e407aa merge
Show More
test_taskfc.py
162 lines | 5.5 KiB | text/x-python | PythonLexer
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__ = {}
import time
from twisted.internet import defer, reactor
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
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.error import CompositeError
from IPython.kernel.parallelfunction import ParallelFunction
Brian E Granger
This is a manual merge of certain things in the ipython1-dev branch, revision 46, into the main ...
r1234
Brian Granger
Removed some tabs and added a new way of skipping tests that have...
r1555 #-------------------------------------------------------------------------------
# Tests
#-------------------------------------------------------------------------------
Brian E Granger
The refactoring of the Task system is nearly complete. Now there are...
r1395
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 E Granger
This is a manual merge of certain things in the ipython1-dev branch, revision 46, into the main ...
r1234
Brian Granger
Removed some tabs and added a new way of skipping tests that have...
r1555 class TaskTest(DeferredTestCase, ITaskControllerTestCase):
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 = cs.ControllerService()
self.controller.startService()
self.imultiengine = me.IMultiEngine(self.controller)
self.itc = taskmodule.ITaskController(self.controller)
self.itc.failurePenalty = 0
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.mec_referenceable = IFCSynchronousMultiEngine(self.imultiengine)
self.tc_referenceable = IFCTaskController(self.itc)
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_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 mec_furl = self.controller_tub.registerReference(self.mec_referenceable)
tc_furl = self.controller_tub.registerReference(self.tc_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=mec_furl)
Brian Granger
Removed some tabs and added a new way of skipping tests that have...
r1555 d.addCallback(self.handle_mec_client)
Brian Granger
Fixed bugs in IPython.kernel....
r2517 d.addCallback(lambda _: self.client_tub.get_task_client(furl_or_file=tc_furl))
Brian Granger
Removed some tabs and added a new way of skipping tests that have...
r1555 d.addCallback(self.handle_tc_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_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)
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(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)
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(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
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(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
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(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
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(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
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.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
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(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))
Fernando Perez
Disable completely two sets of Twisted tests so the suite runs....
r2420 return d
Brian Granger
Fixed bugs in IPython.kernel....
r2517