##// END OF EJS Templates
[core][tests][hooks] Remove nose
Samuel Gaist -
Show More
@@ -6,7 +6,6 b''
6 # Imports
6 # Imports
7 #-----------------------------------------------------------------------------
7 #-----------------------------------------------------------------------------
8
8
9 import nose.tools as nt
10 from IPython.core.error import TryNext
9 from IPython.core.error import TryNext
11 from IPython.core.hooks import CommandChainDispatcher
10 from IPython.core.hooks import CommandChainDispatcher
12
11
@@ -38,27 +37,26 b' class Fail(object):'
38
37
39 def test_command_chain_dispatcher_ff():
38 def test_command_chain_dispatcher_ff():
40 """Test two failing hooks"""
39 """Test two failing hooks"""
41 fail1 = Fail(u'fail1')
40 fail1 = Fail("fail1")
42 fail2 = Fail(u'fail2')
41 fail2 = Fail("fail2")
43 dp = CommandChainDispatcher([(0, fail1),
42 dp = CommandChainDispatcher([(0, fail1), (10, fail2)])
44 (10, fail2)])
45
43
46 try:
44 try:
47 dp()
45 dp()
48 except TryNext as e:
46 except TryNext as e:
49 nt.assert_equal(str(e), u'fail2')
47 assert str(e) == "fail2"
50 else:
48 else:
51 assert False, "Expected exception was not raised."
49 assert False, "Expected exception was not raised."
52
50
53 nt.assert_true(fail1.called)
51 assert fail1.called is True
54 nt.assert_true(fail2.called)
52 assert fail2.called is True
55
53
56 def test_command_chain_dispatcher_fofo():
54 def test_command_chain_dispatcher_fofo():
57 """Test a mixture of failing and succeeding hooks."""
55 """Test a mixture of failing and succeeding hooks."""
58 fail1 = Fail(u'fail1')
56 fail1 = Fail("fail1")
59 fail2 = Fail(u'fail2')
57 fail2 = Fail("fail2")
60 okay1 = Okay(u'okay1')
58 okay1 = Okay("okay1")
61 okay2 = Okay(u'okay2')
59 okay2 = Okay("okay2")
62
60
63 dp = CommandChainDispatcher([(0, fail1),
61 dp = CommandChainDispatcher([(0, fail1),
64 # (5, okay1), # add this later
62 # (5, okay1), # add this later
@@ -66,12 +64,12 b' def test_command_chain_dispatcher_fofo():'
66 (15, okay2)])
64 (15, okay2)])
67 dp.add(okay1, 5)
65 dp.add(okay1, 5)
68
66
69 nt.assert_equal(dp(), u'okay1')
67 assert dp() == "okay1"
70
68
71 nt.assert_true(fail1.called)
69 assert fail1.called is True
72 nt.assert_true(okay1.called)
70 assert okay1.called is True
73 nt.assert_false(fail2.called)
71 assert fail2.called is False
74 nt.assert_false(okay2.called)
72 assert okay2.called is False
75
73
76 def test_command_chain_dispatcher_eq_priority():
74 def test_command_chain_dispatcher_eq_priority():
77 okay1 = Okay(u'okay1')
75 okay1 = Okay(u'okay1')
General Comments 0
You need to be logged in to leave comments. Login now