##// END OF EJS Templates
Fixing a nasty bug in test_frontend.py that was leading to all sorts...
Brian Granger -
Show More
@@ -25,6 +25,8 b' except ImportError:'
25 import nose
25 import nose
26 raise nose.SkipTest("This test requires zope.interface, Twisted and Foolscap")
26 raise nose.SkipTest("This test requires zope.interface, Twisted and Foolscap")
27
27
28 from IPython.testing.decorators import skip
29
28 class FrontEndCallbackChecker(AsyncFrontEndBase):
30 class FrontEndCallbackChecker(AsyncFrontEndBase):
29 """FrontEndBase subclass for checking callbacks"""
31 """FrontEndBase subclass for checking callbacks"""
30 def __init__(self, engine=None, history=None):
32 def __init__(self, engine=None, history=None):
@@ -56,12 +58,10 b' class TestAsyncFrontendBase(unittest.TestCase):'
56
58
57 self.fb = FrontEndCallbackChecker(engine=EngineService())
59 self.fb = FrontEndCallbackChecker(engine=EngineService())
58
60
59
60 def test_implements_IFrontEnd(self):
61 def test_implements_IFrontEnd(self):
61 assert(frontendbase.IFrontEnd.implementedBy(
62 assert(frontendbase.IFrontEnd.implementedBy(
62 AsyncFrontEndBase))
63 AsyncFrontEndBase))
63
64
64
65 def test_is_complete_returns_False_for_incomplete_block(self):
65 def test_is_complete_returns_False_for_incomplete_block(self):
66 """"""
66 """"""
67
67
@@ -80,7 +80,6 b' class TestAsyncFrontendBase(unittest.TestCase):'
80
80
81 assert(self.fb.is_complete(block))
81 assert(self.fb.is_complete(block))
82
82
83
84 def test_blockID_added_to_result(self):
83 def test_blockID_added_to_result(self):
85 block = """3+3"""
84 block = """3+3"""
86
85
@@ -113,12 +112,11 b' class TestAsyncFrontendBase(unittest.TestCase):'
113 d = self.fb.execute("10+10")
112 d = self.fb.execute("10+10")
114 d.addCallback(self.checkCallbacks)
113 d.addCallback(self.checkCallbacks)
115
114
116
117 def checkCallbacks(self, result):
115 def checkCallbacks(self, result):
118 assert(self.fb.updateCalled)
116 assert(self.fb.updateCalled)
119 assert(self.fb.renderResultCalled)
117 assert(self.fb.renderResultCalled)
120
118
121
119 @skip("This test fails and lead to an unhandled error in a Deferred.")
122 def test_error_callback_added_to_execute(self):
120 def test_error_callback_added_to_execute(self):
123 """test that render_error called on execution error"""
121 """test that render_error called on execution error"""
124
122
General Comments 0
You need to be logged in to leave comments. Login now