Changeset 79:0752a1cca356 in ralphm-patches for server-stream-manager.patch
- Timestamp:
- Jun 22, 2016, 4:43:00 PM (6 years ago)
- Branch:
- default
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
server-stream-manager.patch
r72 r79 1 1 # HG changeset patch 2 2 # Parent 3f3fe954b1975c2d9115e0fa8177ae7b28a708a8 3 # Parent e198cebf36146a768eda902efa5ee741e947fda8 3 4 Generalize StreamManager and add ServerStreamManager. 4 5 … … 35 36 --- a/wokkel/subprotocols.py 36 37 +++ b/wokkel/subprotocols.py 37 @@ -1 18,7 +118,7 @@38 @@ -122,7 +122,7 @@ 38 39 39 40 … … 44 45 Business logic representing a managed XMPP connection. 45 46 46 @@ -1 29,43 +129,39 @@47 @@ -133,43 +133,39 @@ 47 48 48 49 @ivar xmlstream: currently managed XML stream … … 95 96 from twisted.internet import reactor 96 97 self._reactor = reactor 97 @@ -19 1,7 +187,7 @@98 @@ -195,7 +191,7 @@ 98 99 handler.connectionInitialized() 99 100 … … 104 105 Called when the transport connection has been established. 105 106 106 @@ -2 09,13 +205,17 @@107 @@ -213,13 +209,17 @@ 107 108 xs.rawDataInFn = logDataIn 108 109 xs.rawDataOutFn = logDataOut … … 123 124 Called when the stream has been initialized. 124 125 125 @@ -2 38,21 +238,8 @@126 @@ -242,21 +242,8 @@ 126 127 e.connectionInitialized() 127 128 … … 146 147 Called when the stream has been closed. 147 148 148 @@ - 379,6 +366,60 @@149 @@ -468,6 +455,60 @@ 149 150 150 151 … … 233 234 --- a/wokkel/test/test_subprotocols.py 234 235 +++ b/wokkel/test/test_subprotocols.py 235 @@ -1 89,20 +189,7 @@236 @@ -190,22 +190,7 @@ 236 237 237 238 … … 250 251 - self.xmlstream.transport = self.transport 251 252 - 252 - self.request = IQGetStanza() 253 - self.request = IQGetStanza(recipient=JID('other@example.org'), 254 - sender=JID('user@example.org')) 255 - 253 256 +class BaseStreamManagerTestsMixin(object): 254 257 255 258 def _streamStarted(self): 256 259 """ 257 @@ -21 6,25 +203,14 @@260 @@ -219,25 +204,14 @@ 258 261 self.xmlstream.dispatch(self.xmlstream, "//event/stream/authd") 259 262 … … 285 288 Test that protocol handlers have their connectionMade method called 286 289 when the XML stream is connected. 287 @@ -24 2,27 +218,27 @@290 @@ -245,27 +219,27 @@ 288 291 sm = self.streamManager 289 292 handler = DummyXMPPHandler() … … 319 322 Test raw data functions set when logTraffic is set to True. 320 323 """ 321 @@ -27 0,13 +246,13 @@324 @@ -273,13 +247,13 @@ 322 325 sm.logTraffic = True 323 326 handler = DummyXMPPHandler() … … 336 339 Test that protocol handlers have their connectionInitialized method 337 340 called when the XML stream is initialized. 338 @@ -28 4,27 +260,27 @@341 @@ -287,27 +261,27 @@ 339 342 sm = self.streamManager 340 343 handler = DummyXMPPHandler() … … 369 372 A L{STREAM_END_EVENT} results in L{StreamManager} firing the handlers 370 373 L{connectionLost} methods, passing a L{failure.Failure} reason. 371 @@ -31 3,7 +289,7 @@374 @@ -316,7 +290,7 @@ 372 375 handler = FailureReasonXMPPHandler() 373 376 handler.setHandlerParent(sm) … … 378 381 379 382 380 @@ -33 5,8 +311,8 @@383 @@ -338,8 +312,8 @@ 381 384 Adding a handler when connected doesn't call connectionInitialized. 382 385 """ … … 389 392 handler.setHandlerParent(sm) 390 393 391 @@ -3 58,10 +334,10 @@394 @@ -361,10 +335,10 @@ 392 395 self.nestedHandler.setHandlerParent(self.parent) 393 396 … … 402 405 self.assertEquals(1, handler.doneMade) 403 406 self.assertEquals(0, handler.doneInitialized) 404 @@ -38 3,9 +359,9 @@407 @@ -386,9 +360,9 @@ 405 408 called. 406 409 """ … … 415 418 handler.setHandlerParent(sm) 416 419 417 @@ -4 07,11 +383,11 @@420 @@ -410,11 +384,11 @@ 418 421 self.nestedHandler.setHandlerParent(self.parent) 419 422 … … 430 433 self.assertEquals(1, handler.doneMade) 431 434 self.assertEquals(1, handler.doneInitialized) 432 @@ -43 5,12 +411,12 @@435 @@ -438,12 +412,12 @@ 433 436 self.nestedHandler.setHandlerParent(self.parent) 434 437 … … 447 450 self.assertEquals(1, handler.doneMade) 448 451 self.assertEquals(1, handler.doneInitialized) 449 @@ -47 0,16 +446,13 @@452 @@ -473,16 +447,13 @@ 450 453 451 454 The data should be sent directly over the XML stream. … … 466 469 467 470 468 @@ -49 0,12 +463,11 @@471 @@ -493,12 +464,11 @@ 469 472 The data should be cached until an XML stream has been established and 470 473 initialized. … … 481 484 sm.send("<presence/>") 482 485 self.assertEquals("", xs.transport.value()) 483 @@ -52 2,7 +494,7 @@486 @@ -525,7 +495,7 @@ 484 487 """ 485 488 factory = xmlstream.XmlStreamFactory(xmlstream.Authenticator()) … … 490 493 xs.connectionMade() 491 494 xs.dataReceived("<stream:stream xmlns='jabber:client' " 492 @@ -54 5,7 +517,7 @@495 @@ -548,7 +518,7 @@ 493 496 handler = DummyXMPPHandler() 494 497 sm.addHandler(handler) … … 499 502 xs.transport = proto_helpers.StringTransport() 500 503 xs.connectionLost(None) 501 @@ - 677,6 +649,7 @@504 @@ -720,6 +690,7 @@ 502 505 """ 503 506 d = self.streamManager.request(self.request) … … 507 510 self.assertFailure(d, ConnectionDone) 508 511 return d 509 @@ - 692,6 +665,7 @@512 @@ -735,6 +706,7 @@ 510 513 d = xmlstream.IQ(self.xmlstream).send() 511 514 d.addErrback(eb) … … 515 518 d.addErrback(eb) 516 519 self.xmlstream.connectionLost(failure.Failure(ConnectionDone())) 517 @@ -7 36,6 +710,7 @@520 @@ -780,6 +752,7 @@ 518 521 self.request.timeout = 60 519 522 d = self.streamManager.request(self.request) … … 523 526 self.assertFailure(d, ConnectionDone) 524 527 self.assertFalse(self.clock.calls) 525 @@ - 778,6 +753,56@@528 @@ -822,6 +795,58 @@ 526 529 527 530 … … 540 543 + self.xmlstream.transport = self.transport 541 544 + 542 + self.request = IQGetStanza() 545 + self.request = IQGetStanza(recipient=JID('other@example.org'), 546 + sender=JID('user@example.org')) 543 547 + 544 548 + … … 573 577 + self.streamManager.makeConnection) 574 578 + 575 + self.request = IQGetStanza() 579 + self.request = IQGetStanza(recipient=JID('other@example.org'), 580 + sender=JID('user@example.org')) 576 581 + 577 582 +
Note: See TracChangeset
for help on using the changeset viewer.