Skip to content

Commit 361f8b8

Browse files
Fix test_websocket.py
1 parent ac7daa0 commit 361f8b8

File tree

1 file changed

+9
-11
lines changed

1 file changed

+9
-11
lines changed

tests/test_websocket.py

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
import time
55

66
from mpos import App, PackageManager
7+
from mpos import TaskManager
78
import mpos.apps
89

910
from websocket import WebSocketApp
@@ -12,6 +13,8 @@ class TestMutlipleWebsocketsAsyncio(unittest.TestCase):
1213

1314
max_allowed_connections = 3 # max that echo.websocket.org allows
1415

16+
#relays = ["wss://echo.websocket.org" ]
17+
#relays = ["wss://echo.websocket.org", "wss://echo.websocket.org"]
1518
#relays = ["wss://echo.websocket.org", "wss://echo.websocket.org", "wss://echo.websocket.org" ] # more gives "too many requests" error
1619
relays = ["wss://echo.websocket.org", "wss://echo.websocket.org", "wss://echo.websocket.org", "wss://echo.websocket.org", "wss://echo.websocket.org" ] # more might give "too many requests" error
1720
wslist = []
@@ -51,7 +54,7 @@ async def closeall(self):
5154
for ws in self.wslist:
5255
await ws.close()
5356

54-
async def main(self) -> None:
57+
async def run_main(self) -> None:
5558
tasks = []
5659
self.wslist = []
5760
for idx, wsurl in enumerate(self.relays):
@@ -89,10 +92,12 @@ async def main(self) -> None:
8992
await asyncio.sleep(1)
9093
self.assertGreaterEqual(self.on_close_called, min(len(self.relays),self.max_allowed_connections), "on_close was called for less than allowed connections")
9194

92-
self.assertEqual(self.on_error_called, len(self.relays) - self.max_allowed_connections, "expecting one error per failed connection")
95+
self.assertEqual(self.on_error_called, max(0, len(self.relays) - self.max_allowed_connections), "expecting one error per failed connection")
9396

9497
# Wait for *all* of them to finish (or be cancelled)
9598
# If this hangs, it's also a failure:
99+
print(f"doing gather of tasks: {tasks}")
100+
for index, task in enumerate(tasks): print(f"task {index}: ph_key:{task.ph_key} done:{task.done()} running {task.coro}")
96101
await asyncio.gather(*tasks, return_exceptions=True)
97102

98103
def wait_for_ping(self):
@@ -105,12 +110,5 @@ def wait_for_ping(self):
105110
time.sleep(1)
106111
self.assertTrue(self.on_ping_called)
107112

108-
def test_it_loop(self):
109-
for testnr in range(1):
110-
print(f"starting iteration {testnr}")
111-
asyncio.run(self.do_two())
112-
print(f"finished iteration {testnr}")
113-
114-
def do_two(self):
115-
await self.main()
116-
113+
def test_it(self):
114+
asyncio.run(self.run_main())

0 commit comments

Comments
 (0)