Annikka/evennia
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Cleanup

Browse source
This commit is contained in:
trhr 2020-05-09 22:25:51 -05:00
parent 0ea77b959b
commit 064a690f46
1 changed files with 2 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

19
evennia/server/portal/tests.py
View file

@ -17,8 +17,7 @@ import json
from mock import Mock, MagicMock from mock import Mock, MagicMock
from evennia.server.portal import irc from evennia.server.portal import irc
from evennia.utils.test_resources import mockdelay, EvenniaTest, patch from evennia.utils.test_resources import EvenniaTest
from twisted import internet
from twisted.conch.telnet import IAC, WILL, DONT, SB, SE, NAWS, DO from twisted.conch.telnet import IAC, WILL, DONT, SB, SE, NAWS, DO
from twisted.test import proto_helpers from twisted.test import proto_helpers
@ -37,7 +36,7 @@ from .telnet_oob import MSDP, MSDP_VAL, MSDP_VAR
from .amp import AMPMultiConnectionProtocol, MsgServer2Portal, MsgPortal2Server, AMP_MAXLEN from .amp import AMPMultiConnectionProtocol, MsgServer2Portal, MsgPortal2Server, AMP_MAXLEN
from .amp_server import AMPServerFactory from .amp_server import AMPServerFactory
from autobahn.twisted.websocket import WebSocketServerFactory, WebSocketServerProtocol from autobahn.twisted.websocket import WebSocketServerFactory
from .webclient import WebSocketClient from .webclient import WebSocketClient
@ -282,20 +281,6 @@ class TestTelnet(TwistedTestCase):
class WebSocket(EvenniaTest): class WebSocket(EvenniaTest):
def setUp(self): def setUp(self):
super().setUp() super().setUp()
# from autobahn.websocket.protocol import WebSocketProtocol
# WebSocketServerProtocol.log = Mock()
# internet.base.DelayedCall.debug = True
# self.proto = WebSocketClient()
# self.proto.factory = WebSocketServerFactory()
# self.proto.factory.sessionhandler = PORTAL_SESSIONS
# self.proto.sessionhandler = PORTAL_SESSIONS
# self.proto.sessionhandler.portal = Mock()
# self.proto.data_in = MagicMock()
# self.proto.data_out = MagicMock()
# self.transport = WebSocketProtocol()
# self.transport.client = ["localhost"]
# self.transport.setTcpKeepAlive = Mock()
# self.proto.state = WebSocketProtocol.STATE_OPEN
self.proto = WebSocketClient() self.proto = WebSocketClient()
self.proto.factory = WebSocketServerFactory() self.proto.factory = WebSocketServerFactory()
self.proto.factory.sessionhandler = PORTAL_SESSIONS self.proto.factory.sessionhandler = PORTAL_SESSIONS