Changeset 194:f1b586df427b for wokkel/test/test_subprotocols.py
- Timestamp:
- Oct 3, 2016, 8:49:10 AM (6 years ago)
- Branch:
- default
- rebase_source:
- 77cb4411a2525cb7b972b664a751e11c11b7cf65
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
wokkel/test/test_subprotocols.py
r165 r194 5 5 Tests for L{wokkel.subprotocols} 6 6 """ 7 8 from __future__ import division, absolute_import 7 9 8 10 from zope.interface.verify import verifyObject … … 211 213 self.xmlstream.connectionMade() 212 214 self.xmlstream.dataReceived( 213 "<stream:stream xmlns='jabber:client' "214 "xmlns:stream='http://etherx.jabber.org/streams' "215 "from='example.com' id='12345'>")215 b"<stream:stream xmlns='jabber:client' " 216 b"xmlns:stream='http://etherx.jabber.org/streams' " 217 b"from='example.com' id='12345'>") 216 218 self.xmlstream.dispatch(self.xmlstream, "//event/stream/authd") 217 219 … … 476 478 xs.transport = proto_helpers.StringTransport() 477 479 xs.connectionMade() 478 xs.dataReceived( "<stream:stream xmlns='jabber:client' "479 "xmlns:stream='http://etherx.jabber.org/streams' "480 "from='example.com' id='12345'>")480 xs.dataReceived(b"<stream:stream xmlns='jabber:client' " 481 b"xmlns:stream='http://etherx.jabber.org/streams' " 482 b"from='example.com' id='12345'>") 481 483 xs.dispatch(xs, "//event/stream/authd") 482 484 sm.send("<presence/>") 483 self.assertEquals( "<presence/>", xs.transport.value())485 self.assertEquals(b"<presence/>", xs.transport.value()) 484 486 485 487 … … 499 501 xs.transport = proto_helpers.StringTransport() 500 502 sm.send("<presence/>") 501 self.assertEquals( "", xs.transport.value())503 self.assertEquals(b"", xs.transport.value()) 502 504 self.assertEquals("<presence/>", sm._packetQueue[0]) 503 505 504 506 xs.connectionMade() 505 self.assertEquals( "", xs.transport.value())507 self.assertEquals(b"", xs.transport.value()) 506 508 self.assertEquals("<presence/>", sm._packetQueue[0]) 507 509 508 xs.dataReceived( "<stream:stream xmlns='jabber:client' "509 "xmlns:stream='http://etherx.jabber.org/streams' "510 "from='example.com' id='12345'>")510 xs.dataReceived(b"<stream:stream xmlns='jabber:client' " 511 b"xmlns:stream='http://etherx.jabber.org/streams' " 512 b"from='example.com' id='12345'>") 511 513 xs.dispatch(xs, "//event/stream/authd") 512 514 513 self.assertEquals( "<presence/>", xs.transport.value())515 self.assertEquals(b"<presence/>", xs.transport.value()) 514 516 self.assertFalse(sm._packetQueue) 515 517 … … 526 528 xs.transport = proto_helpers.StringTransport() 527 529 xs.connectionMade() 528 xs.dataReceived( "<stream:stream xmlns='jabber:client' "529 "xmlns:stream='http://etherx.jabber.org/streams' "530 "from='example.com' id='12345'>")530 xs.dataReceived(b"<stream:stream xmlns='jabber:client' " 531 b"xmlns:stream='http://etherx.jabber.org/streams' " 532 b"from='example.com' id='12345'>") 531 533 sm.send("<presence/>") 532 self.assertEquals( "", xs.transport.value())534 self.assertEquals(b"", xs.transport.value()) 533 535 self.assertEquals("<presence/>", sm._packetQueue[0]) 534 536 … … 552 554 553 555 sm.send("<presence/>") 554 self.assertEquals( "", xs.transport.value())556 self.assertEquals(b"", xs.transport.value()) 555 557 self.assertEquals("<presence/>", sm._packetQueue[0]) 556 558 … … 563 565 564 566 self.streamManager.request(self.request) 565 expected = u"<iq type='get' id='%s'/>" % self.request.stanzaID 566 self.assertEquals(expected, self.transport.value()) 567 self.assertTrue(self.transport.value()) 567 568 568 569 … … 576 577 self.streamManager.request(self.request) 577 578 self.assertNotIdentical(None, self.request.stanzaID) 578 expected = u"<iq type='get' id='%s'/>" % self.request.stanzaID 579 self.assertEquals(expected, self.transport.value()) 579 self.assertTrue(self.transport.value()) 580 580 581 581 … … 588 588 589 589 self.streamManager.request(self.request) 590 expected = u"<iq type='get' id='test'/>"591 590 592 591 xs = self.xmlstream 593 self.assertEquals( "", xs.transport.value())592 self.assertEquals(b"", xs.transport.value()) 594 593 595 594 xs.connectionMade() 596 self.assertEquals( "", xs.transport.value())597 598 xs.dataReceived( "<stream:stream xmlns='jabber:client' "599 "xmlns:stream='http://etherx.jabber.org/streams' "600 "from='example.com' id='12345'>")595 self.assertEquals(b"", xs.transport.value()) 596 597 xs.dataReceived(b"<stream:stream xmlns='jabber:client' " 598 b"xmlns:stream='http://etherx.jabber.org/streams' " 599 b"from='example.com' id='12345'>") 601 600 xs.dispatch(xs, "//event/stream/authd") 602 601 603 self.assert Equals(expected, xs.transport.value())602 self.assertTrue(self.transport.value()) 604 603 self.assertFalse(self.streamManager._packetQueue) 605 604 … … 617 616 618 617 xs = self.xmlstream 619 xs.dataReceived( "<iq type='result' id='test'/>")618 xs.dataReceived(b"<iq type='result' id='test'/>") 620 619 return d 621 620 … … 630 629 631 630 xs = self.xmlstream 632 xs.dataReceived( "<iq type='error' id='test'/>")631 xs.dataReceived(b"<iq type='error' id='test'/>") 633 632 return d 634 633 … … 652 651 653 652 # Receive an untracked iq response 654 self.xmlstream.dataReceived( "<iq type='result' id='other'/>")653 self.xmlstream.dataReceived(b"<iq type='result' id='other'/>") 655 654 self.assertEquals(1, len(dispatched)) 656 655 self.assertFalse(getattr(dispatched[-1], 'handled', False)) … … 666 665 d = self.streamManager.request(self.request) 667 666 xs = self.xmlstream 668 xs.dataReceived( "<iq type='result' id='test'/>")667 xs.dataReceived(b"<iq type='result' id='test'/>") 669 668 self.assertNotIn('test', self.streamManager._iqDeferreds) 670 669 return d … … 722 721 d = self.streamManager.request(self.request) 723 722 self.clock.callLater(1, self.xmlstream.dataReceived, 724 "<iq type='result' id='test'/>")723 b"<iq type='result' id='test'/>") 725 724 self.clock.pump([1, 1]) 726 725 self.assertFalse(self.clock.calls) … … 868 867 self.assertEquals('iq', response.name) 869 868 self.assertEquals('result', response['type']) 870 payload = response.elements().next()869 payload = next(response.elements()) 871 870 self.assertEqual(handler.payload, payload) 872 871
Note: See TracChangeset
for help on using the changeset viewer.