Eliminate the risk of a busy loop in tests.

If these tests reached the point where websockets tried to send a second
ping, it would loop on trying to find a payload not sent yet.

Author: aaugustin

tests/asyncio/test_connection.py

@@ -1,5 +1,6 @@
 import asyncio
 import contextlib
+import itertools
 import logging
 import socket
 import sys
@@ -903,9 +904,10 @@ async def test_wait_closed(self):
 
     # Test ping.
 
-    @patch("random.getrandbits", return_value=1918987876)
+    @patch("random.getrandbits")
     async def test_ping(self, getrandbits):
         """ping sends a ping frame with a random payload."""
+        getrandbits.side_effect = itertools.count(1918987876)
         await self.connection.ping()
         getrandbits.assert_called_once_with(32)
         await self.assertFrameSent(Frame(Opcode.PING, b"rand"))
@@ -1014,9 +1016,10 @@ async def test_pong_unsupported_type(self):
 
     # Test keepalive.
 
-    @patch("random.getrandbits", return_value=1918987876)
+    @patch("random.getrandbits")
     async def test_keepalive(self, getrandbits):
         """keepalive sends pings at ping_interval and measures latency."""
+        getrandbits.side_effect = itertools.count(1918987876)
         self.connection.ping_interval = 3 * MS
         self.connection.start_keepalive()
         self.assertIsNotNone(self.connection.keepalive_task)
@@ -1035,9 +1038,10 @@ async def test_disable_keepalive(self):
         self.connection.start_keepalive()
         self.assertIsNone(self.connection.keepalive_task)
 
-    @patch("random.getrandbits", return_value=1918987876)
+    @patch("random.getrandbits")
     async def test_keepalive_times_out(self, getrandbits):
         """keepalive closes the connection if ping_timeout elapses."""
+        getrandbits.side_effect = itertools.count(1918987876)
         self.connection.ping_interval = 4 * MS
         self.connection.ping_timeout = 2 * MS
         async with self.drop_frames_rcvd():
@@ -1050,9 +1054,10 @@ async def test_keepalive_times_out(self, getrandbits):
         # 7 ms: check that the connection is closed.
         self.assertEqual(self.connection.state, State.CLOSED)
 
-    @patch("random.getrandbits", return_value=1918987876)
+    @patch("random.getrandbits")
     async def test_keepalive_ignores_timeout(self, getrandbits):
         """keepalive ignores timeouts if ping_timeout isn't set."""
+        getrandbits.side_effect = itertools.count(1918987876)
         self.connection.ping_interval = 4 * MS
         self.connection.ping_timeout = None
         async with self.drop_frames_rcvd():

tests/sync/test_connection.py

@@ -1,4 +1,5 @@
 import contextlib
+import itertools
 import logging
 import socket
 import sys
@@ -643,9 +644,10 @@ def fragments():
 
     # Test ping.
 
-    @patch("random.getrandbits", return_value=1918987876)
+    @patch("random.getrandbits")
     def test_ping(self, getrandbits):
         """ping sends a ping frame with a random payload."""
+        getrandbits.side_effect = itertools.count(1918987876)
         self.connection.ping()
         getrandbits.assert_called_once_with(32)
         self.assertFrameSent(Frame(Opcode.PING, b"rand"))
@@ -737,10 +739,11 @@ def test_pong_unsupported_type(self):
 
     # Test keepalive.
 
-    @patch("random.getrandbits", return_value=1918987876)
+    @patch("random.getrandbits")
     def test_keepalive(self, getrandbits):
         """keepalive sends pings at ping_interval and measures latency."""
         self.connection.ping_interval = 4 * MS
+        getrandbits.side_effect = itertools.count(1918987876)
         self.connection.start_keepalive()
         self.assertIsNotNone(self.connection.keepalive_thread)
         self.assertEqual(self.connection.latency, 0)
@@ -758,9 +761,10 @@ def test_disable_keepalive(self):
         self.connection.start_keepalive()
         self.assertIsNone(self.connection.keepalive_thread)
 
-    @patch("random.getrandbits", return_value=1918987876)
+    @patch("random.getrandbits")
     def test_keepalive_times_out(self, getrandbits):
         """keepalive closes the connection if ping_timeout elapses."""
+        getrandbits.side_effect = itertools.count(1918987876)
         self.connection.ping_interval = 4 * MS
         self.connection.ping_timeout = 2 * MS
         with self.drop_frames_rcvd():
@@ -774,9 +778,10 @@ def test_keepalive_times_out(self, getrandbits):
         # 7 ms: check that the connection is closed.
         self.assertEqual(self.connection.state, State.CLOSED)
 
-    @patch("random.getrandbits", return_value=1918987876)
+    @patch("random.getrandbits")
     def test_keepalive_ignores_timeout(self, getrandbits):
         """keepalive ignores timeouts if ping_timeout isn't set."""
+        getrandbits.side_effect = itertools.count(1918987876)
         self.connection.ping_interval = 4 * MS
         self.connection.ping_timeout = None
         with self.drop_frames_rcvd():