diff options
| author | Philipp Hörist <philipp@hoerist.com> | 2018-11-25 12:37:13 +0300 |
|---|---|---|
| committer | Philipp Hörist <philipp@hoerist.com> | 2018-11-25 14:41:10 +0300 |
| commit | 7f0707facd094338de360f6b3183b01465b7379a (patch) | |
| tree | 8fa507f1212c7884733b85d6999491d7e336dbc3 /test | |
| parent | a228171c9ba639fc2ff1e500d21c1f8b7731fb97 (diff) | |
Fix Tests
Diffstat (limited to 'test')
| -rw-r--r-- | test/broken/test_xmpp_smacks.py (renamed from test/unit/test_xmpp_smacks.py) | 10 | ||||
| -rw-r--r-- | test/unit/test_xmpp_dispatcher_nb.py | 15 | ||||
| -rw-r--r-- | test/unit/test_xmpp_transports_nb2.py | 10 |
3 files changed, 16 insertions, 19 deletions
diff --git a/test/unit/test_xmpp_smacks.py b/test/broken/test_xmpp_smacks.py index 51810e9..d56bb64 100644 --- a/test/unit/test_xmpp_smacks.py +++ b/test/broken/test_xmpp_smacks.py @@ -2,8 +2,7 @@ Tests for smacks.py Stream Management ''' import unittest - -from test.lib.mock import Mock +from unittest.mock import Mock from nbxmpp import dispatcher_nb from nbxmpp import protocol @@ -19,12 +18,11 @@ class TestDispatcherNB(unittest.TestCase): # Setup mock client self.client = Mock() - self.client.__str__ = lambda: 'Mock' # FIXME: why do I need this one? self.client._caller = Mock() self.client.defaultNamespace = protocol.NS_CLIENT self.client.Connection = Mock() # mock transport self.con = self.client.Connection - self.con.sm = smacks.Smacks(self.con) + self.con.sm = smacks.Smacks() def tearDown(self): # Unplug if needed @@ -33,8 +31,8 @@ class TestDispatcherNB(unittest.TestCase): def _simulate_connect(self): self.dispatcher.PlugIn(self.client) # client is owner - self.con.sm.set_owner(self.client) - self.dispatcher.sm = self.con.sm + self.con.sm.PlugIn(self.client) + # Simulate that we have established a connection self.dispatcher.StreamInit() self.dispatcher.ProcessNonBlocking("<stream:stream " diff --git a/test/unit/test_xmpp_dispatcher_nb.py b/test/unit/test_xmpp_dispatcher_nb.py index d730cc5..2156781 100644 --- a/test/unit/test_xmpp_dispatcher_nb.py +++ b/test/unit/test_xmpp_dispatcher_nb.py @@ -2,11 +2,10 @@ Tests for dispatcher_nb.py ''' import unittest +from unittest.mock import Mock from test import lib -from test.lib.mock import Mock - from nbxmpp import dispatcher_nb from nbxmpp import protocol @@ -20,7 +19,6 @@ class TestDispatcherNB(unittest.TestCase): # Setup mock client self.client = Mock() - self.client.__str__ = lambda: 'Mock' # FIXME: why do I need this one? self.client._caller = Mock() self.client.defaultNamespace = protocol.NS_CLIENT self.client.Connection = Mock() # mock transport @@ -53,8 +51,8 @@ class TestDispatcherNB(unittest.TestCase): self.dispatcher.ProcessNonBlocking('<message><x:y/></message>') self.assertEqual(2, len(msgs)) # we should not have been disconnected after that message - self.assertEqual(0, len(self.con.mockGetNamedCalls('pollend'))) - self.assertEqual(0, len(self.con.mockGetNamedCalls('disconnect'))) + self.con.pollend.assert_not_called() + self.con.disconnect.assert_not_called() # we should be able to keep parsing self.dispatcher.ProcessNonBlocking('<message><body>still here?</body></message>') @@ -73,12 +71,13 @@ class TestDispatcherNB(unittest.TestCase): # no data processed, link shall still be active result = process('') self.assertEqual(result, '0') - self.assertEqual(0, len(self.con.mockGetNamedCalls('pollend')) + - len(self.con.mockGetNamedCalls('disconnect'))) + + self.con.pollend.assert_not_called() + self.con.disconnect.assert_not_called() # simulate disconnect result = process('</stream:stream>') - self.assertEqual(1, len(self.client.mockGetNamedCalls('disconnect'))) + self.client.disconnect.assert_called_once() def test_return_stanza_handler(self): ''' Test sasl_error_conditions transformation in protocol.py ''' diff --git a/test/unit/test_xmpp_transports_nb2.py b/test/unit/test_xmpp_transports_nb2.py index ce521a0..7caeda8 100644 --- a/test/unit/test_xmpp_transports_nb2.py +++ b/test/unit/test_xmpp_transports_nb2.py @@ -117,9 +117,9 @@ class TestNonBlockingTCP(AbstractTransportTest): def test_connect_disconnect_plain(self): ''' Establish plain connection ''' self.client.do_connect(establish_tls=False) - self.assertEquals(self.client.socket.state, 'CONNECTED') + self.assertEqual(self.client.socket.state, 'CONNECTED') self.client.do_disconnect() - self.assertEquals(self.client.socket.state, 'DISCONNECTED') + self.assertEqual(self.client.socket.state, 'DISCONNECTED') # def test_connect_disconnect_ssl(self): # ''' Establish SSL (not TLS) connection ''' @@ -139,19 +139,19 @@ class TestNonBlockingTCP(AbstractTransportTest): sock.onreceive(self.expect_receive(data)) sock._do_receive() self.assertTrue(self.have_received_expected(), msg='Did not receive data') - self.assert_(self.client.socket.state == 'CONNECTED') + self.assertEqual(self.client.socket.state, 'CONNECTED') # transport shall do nothing as an non-fatal SSL is simulated sock._recv = lambda buffer: None sock.onreceive(self.assertFalse) # we did not receive anything... sock._do_receive() - self.assert_(self.client.socket.state == 'CONNECTED') + self.assertEqual(self.client.socket.state, 'CONNECTED') # transport shall disconnect as remote side closed the connection sock._recv = lambda buffer: '' sock.onreceive(self.assertFalse) # we did not receive anything... sock._do_receive() - self.assert_(self.client.socket.state == 'DISCONNECTED') + self.assertEqual(self.client.socket.state, 'DISCONNECTED') def test_do_send(self): ''' Test _do_send method by overwriting socket.send ''' |