Skip to content
Snippets Groups Projects
Commit e18200f8 authored by davebshow's avatar davebshow
Browse files

fixed bug with context manager close

parent 329fbaf5
No related branches found
No related tags found
No related merge requests found
...@@ -134,8 +134,8 @@ class GremlinClientWebSocketResponse(BaseConnection, ClientWebSocketResponse): ...@@ -134,8 +134,8 @@ class GremlinClientWebSocketResponse(BaseConnection, ClientWebSocketResponse):
@asyncio.coroutine @asyncio.coroutine
def close(self, *, code=1000, message=b''): def close(self, *, code=1000, message=b''):
if not self._closed: if not self._closed:
closed = self._close() do_close = self._close()
if closed: if do_close:
return True return True
while True: while True:
try: try:
...@@ -158,7 +158,7 @@ class GremlinClientWebSocketResponse(BaseConnection, ClientWebSocketResponse): ...@@ -158,7 +158,7 @@ class GremlinClientWebSocketResponse(BaseConnection, ClientWebSocketResponse):
else: else:
return False return False
def _close(self): def _close(self, code=1000, message=b''):
self._closed = True self._closed = True
try: try:
self._writer.close(code, message) self._writer.close(code, message)
......
...@@ -11,6 +11,7 @@ class ConnectionContextManager: ...@@ -11,6 +11,7 @@ class ConnectionContextManager:
def __exit__(self, exception_type, exception_value, traceback): def __exit__(self, exception_type, exception_value, traceback):
try: try:
self._conn._closing = True
self._conn._close() self._conn._close()
finally: finally:
self._conn = None self._conn = None
......
...@@ -229,7 +229,7 @@ class ContextMngrTest(unittest.TestCase): ...@@ -229,7 +229,7 @@ class ContextMngrTest(unittest.TestCase):
factory=AiohttpFactory, max_retries=0) factory=AiohttpFactory, max_retries=0)
def tearDown(self): def tearDown(self):
# self.loop.run_until_complete(self.pool.close()) self.loop.run_until_complete(self.pool.close())
self.loop.close() self.loop.close()
def test_connection_manager(self): def test_connection_manager(self):
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment