jyapayne/socketIO-client
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix broken test

Browse source
This commit is contained in:
Roy Hyunjin Han 2015-02-22 20:45:27 -05:00
commit 34c56a3da3
2 changed files with 10 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

13
socketIO_client/__init__.py
View file

@ -30,21 +30,20 @@ class EngineIO(LoggingMixin):
self._http_session = prepare_http_session(kw) self._http_session = prepare_http_session(kw)
self._log_name = self._url self._log_name = self._url
self._wants_to_close = False self._wants_to_close = False
self._connected = False self.connected = False
if Namespace: if Namespace:
self.define(Namespace) self.define(Namespace)
# self._transport
# Connect # Connect
@property @property
def _transport(self): def _transport(self):
if self._connected: if self.connected:
return self._transport_instance return self._transport_instance
self._engineIO_session = self._get_engineIO_session() self._engineIO_session = self._get_engineIO_session()
self._transport_instance = self._negotiate_transport() self._transport_instance = self._negotiate_transport()
self._connect_namespaces() self._connect_namespaces()
self._connected = True self.connected = True
self._reset_heartbeat() self._reset_heartbeat()
return self._transport_instance return self._transport_instance
@ -134,11 +133,11 @@ class EngineIO(LoggingMixin):
def _close(self): def _close(self):
self._wants_to_close = True self._wants_to_close = True
if not self._connected: if not self.connected:
return return
engineIO_packet_type = 1 engineIO_packet_type = 1
self._transport.send_packet(engineIO_packet_type, '') self._transport.send_packet(engineIO_packet_type, '')
self._connected = False self.connected = False
def _ping(self, engineIO_packet_data=''): def _ping(self, engineIO_packet_data=''):
engineIO_packet_type = 2 engineIO_packet_type = 2
@ -315,7 +314,7 @@ class SocketIO(EngineIO):
self._message(str(socketIO_packet_type) + socketIO_packet_data) self._message(str(socketIO_packet_type) + socketIO_packet_data)
def disconnect(self, path=''): def disconnect(self, path=''):
if not self._connected: if not self.connected:
return return
if path: if path:
socketIO_packet_type = 1 socketIO_packet_type = 1

9
socketIO_client/tests/__init__.py
View file

@ -24,13 +24,14 @@ class BaseMixin(object):
def test_disconnect(self): def test_disconnect(self):
'Disconnect' 'Disconnect'
self.socketIO.define(LoggingNamespace) self.socketIO.emit('whee')
self.assertTrue(self.socketIO.connected) self.assertTrue(self.socketIO.connected)
self.socketIO.disconnect() self.socketIO.disconnect()
self.assertFalse(self.socketIO.connected) self.assertFalse(self.socketIO.connected)
# Use context manager # Use context manager
with SocketIO(HOST, PORT, Namespace) as self.socketIO: with SocketIO(HOST, PORT, Namespace) as self.socketIO:
namespace = self.socketIO.get_namespace() namespace = self.socketIO.get_namespace()
namespace.emit('whee')
self.assertFalse(namespace.called_on_disconnect) self.assertFalse(namespace.called_on_disconnect)
self.assertTrue(self.socketIO.connected) self.assertTrue(self.socketIO.connected)
self.assertTrue(namespace.called_on_disconnect) self.assertTrue(namespace.called_on_disconnect)
@ -65,14 +66,12 @@ class BaseMixin(object):
def test_emit_with_callback(self): def test_emit_with_callback(self):
'Emit with callback' 'Emit with callback'
self.socketIO.define(LoggingNamespace)
self.socketIO.emit('emit_with_callback', self.on_response) self.socketIO.emit('emit_with_callback', self.on_response)
self.socketIO.wait_for_callbacks(seconds=self.wait_time_in_seconds) self.socketIO.wait_for_callbacks(seconds=self.wait_time_in_seconds)
self.assertTrue(self.called_on_response) self.assertTrue(self.called_on_response)
def test_emit_with_callback_with_payload(self): def test_emit_with_callback_with_payload(self):
'Emit with callback with payload' 'Emit with callback with payload'
self.socketIO.define(LoggingNamespace)
self.socketIO.emit( self.socketIO.emit(
'emit_with_callback_with_payload', self.on_response) 'emit_with_callback_with_payload', self.on_response)
self.socketIO.wait_for_callbacks(seconds=self.wait_time_in_seconds) self.socketIO.wait_for_callbacks(seconds=self.wait_time_in_seconds)
@ -80,7 +79,6 @@ class BaseMixin(object):
def test_emit_with_callback_with_multiple_payloads(self): def test_emit_with_callback_with_multiple_payloads(self):
'Emit with callback with multiple payloads' 'Emit with callback with multiple payloads'
self.socketIO.define(LoggingNamespace)
self.socketIO.emit( self.socketIO.emit(
'emit_with_callback_with_multiple_payloads', self.on_response) 'emit_with_callback_with_multiple_payloads', self.on_response)
self.socketIO.wait_for_callbacks(seconds=self.wait_time_in_seconds) self.socketIO.wait_for_callbacks(seconds=self.wait_time_in_seconds)
@ -162,7 +160,8 @@ class Test_XHR_PollingTransport(BaseMixin, TestCase):
def setUp(self): def setUp(self):
super(Test_XHR_PollingTransport, self).setUp() super(Test_XHR_PollingTransport, self).setUp()
self.socketIO = SocketIO(HOST, PORT, transports=['xhr-polling']) self.socketIO = SocketIO(HOST, PORT, LoggingNamespace, transports=[
'xhr-polling'])
self.wait_time_in_seconds = 1 self.wait_time_in_seconds = 1