Merge pull request #1660 from minrk/test-311

test on 3.11-dev

Author: minrk

.github/workflows/test.yml

@@ -61,6 +61,9 @@ jobs:
           - os: ubuntu-20.04
             python: "3.10"
 
+          - os: ubuntu-20.04
+            python: "3.11-dev"
+
           - os: ubuntu-20.04
             python: 3.8
             zmq: head

test-requirements.txt

@@ -4,7 +4,7 @@ codecov
 # coverage 5 has issues with Cython: https://github.com/cython/cython/issues/3515
 coverage<5
 flake8
-gevent; platform_python_implementation != "PyPy" and sys_platform != "win32" and sys_platform != "darwin"
+gevent; platform_python_implementation != "PyPy" and sys_platform != "win32" and sys_platform != "darwin" and python_version < "3.11"
 mypy; platform_python_implementation != "PyPy"
 pytest
 # pytest-cov 2.11 requires coverage 5, which still doesn't work with Cython

zmq/sugar/context.py

@@ -81,7 +81,7 @@ def __repr__(self) -> str:
             _repr_cls = f"{cls.__module__}.{cls.__name__}"
 
         closed = ' closed' if self.closed else ''
-        if self._sockets:
+        if getattr(self, "_sockets", None):
             n_sockets = len(self._sockets)
             s = 's' if n_sockets > 1 else ''
             sockets = f"{n_sockets} socket{s}"

zmq/tests/test_message.py

@@ -37,9 +37,14 @@ def await_gc(obj, rc):
     Necessary because of the zero-copy gc thread,
     which can take some time to receive its DECREF message.
     """
+    # count refs for this function
+    if sys.version_info < (3, 11):
+        my_refs = 2
+    else:
+        my_refs = 1
     for i in range(50):
         # rc + 2 because of the refs in this function
-        if grc(obj) <= rc + 2:
+        if grc(obj) <= rc + my_refs:
             return
         time.sleep(0.05)
 
@@ -55,12 +60,12 @@ def test_above_30(self):
         """Message above 30 bytes are never copied by 0MQ."""
         for i in range(5, 16):  # 32, 64,..., 65536
             s = (2**i) * x
-            self.assertEqual(grc(s), 2)
+            rc = grc(s)
             m = zmq.Frame(s, copy=False)
-            self.assertEqual(grc(s), 4)
+            self.assertEqual(grc(s), rc + 2)
             del m
-            await_gc(s, 2)
-            self.assertEqual(grc(s), 2)
+            await_gc(s, rc)
+            self.assertEqual(grc(s), rc)
             del s
 
     def test_str(self):
@@ -106,8 +111,7 @@ def test_lifecycle1(self):
         """Run through a ref counting cycle with a copy."""
         for i in range(5, 16):  # 32, 64,..., 65536
             s = (2**i) * x
-            rc = 2
-            self.assertEqual(grc(s), rc)
+            rc = rc_0 = grc(s)
             m = zmq.Frame(s, copy=False)
             rc += 2
             self.assertEqual(grc(s), rc)
@@ -135,16 +139,15 @@ def test_lifecycle1(self):
             rc -= 2
             await_gc(s, rc)
             self.assertEqual(grc(s), rc)
-            self.assertEqual(rc, 2)
+            self.assertEqual(rc, rc_0)
             del s
 
     @skip_pypy
     def test_lifecycle2(self):
         """Run through a different ref counting cycle with a copy."""
         for i in range(5, 16):  # 32, 64,..., 65536
             s = (2**i) * x
-            rc = 2
-            self.assertEqual(grc(s), rc)
+            rc = rc_0 = grc(s)
             m = zmq.Frame(s, copy=False)
             rc += 2
             self.assertEqual(grc(s), rc)
@@ -171,7 +174,7 @@ def test_lifecycle2(self):
             rc -= 2
             await_gc(s, rc)
             self.assertEqual(grc(s), rc)
-            self.assertEqual(rc, 2)
+            self.assertEqual(rc, rc_0)
             del s
 
     def test_tracker(self):

zmq/tests/test_poll.py

@@ -103,7 +103,7 @@ def test_no_events(self):
         poller = self.Poller()
         poller.register(s1, zmq.POLLIN | zmq.POLLOUT)
         poller.register(s2, 0)
-        self.assertTrue(s1 in poller)
+        assert s1 in poller
         self.assertFalse(s2 in poller)
         poller.register(s1, 0)
         self.assertFalse(s1 in poller)
@@ -157,25 +157,26 @@ def test_raw(self):
         w.close()
         r.close()
 
+    @mark.flaky(reruns=3)
     def test_timeout(self):
         """make sure Poller.poll timeout has the right units (milliseconds)."""
         s1, s2 = self.create_bound_pair(zmq.PAIR, zmq.PAIR)
         poller = self.Poller()
         poller.register(s1, zmq.POLLIN)
-        tic = time.time()
+        tic = time.perf_counter()
         evt = poller.poll(0.005)
-        toc = time.time()
-        self.assertTrue(toc - tic < 0.1)
-        tic = time.time()
-        evt = poller.poll(5)
-        toc = time.time()
-        self.assertTrue(toc - tic < 0.1)
-        self.assertTrue(toc - tic > 0.001)
-        tic = time.time()
+        toc = time.perf_counter()
+        toc - tic < 0.1
+        tic = time.perf_counter()
+        evt = poller.poll(50)
+        toc = time.perf_counter()
+        assert toc - tic < 0.1
+        assert toc - tic > 0.01
+        tic = time.perf_counter()
         evt = poller.poll(500)
-        toc = time.time()
-        self.assertTrue(toc - tic < 1)
-        self.assertTrue(toc - tic > 0.1)
+        toc = time.perf_counter()
+        assert toc - tic < 1
+        assert toc - tic > 0.1
 
 
 class TestSelect(PollZMQTestCase):
@@ -186,25 +187,25 @@ def test_pair(self):
         wait()
 
         rlist, wlist, xlist = zmq.select([s1, s2], [s1, s2], [s1, s2])
-        self.assertTrue(s1 in wlist)
-        self.assertTrue(s2 in wlist)
-        self.assertTrue(s1 not in rlist)
-        self.assertTrue(s2 not in rlist)
+        assert s1 in wlist
+        assert s2 in wlist
+        assert s1 not in rlist
+        assert s2 not in rlist
 
     @mark.flaky(reruns=3)
     def test_timeout(self):
         """make sure select timeout has the right units (seconds)."""
         s1, s2 = self.create_bound_pair(zmq.PAIR, zmq.PAIR)
-        tic = time.time()
+        tic = time.perf_counter()
         r, w, x = zmq.select([s1, s2], [], [], 0.005)
-        toc = time.time()
-        self.assertTrue(toc - tic < 1)
-        self.assertTrue(toc - tic > 0.001)
-        tic = time.time()
+        toc = time.perf_counter()
+        assert toc - tic < 1
+        assert toc - tic > 0.001
+        tic = time.perf_counter()
         r, w, x = zmq.select([s1, s2], [], [], 0.25)
-        toc = time.time()
-        self.assertTrue(toc - tic < 1)
-        self.assertTrue(toc - tic > 0.1)
+        toc = time.perf_counter()
+        assert toc - tic < 1
+        assert toc - tic > 0.1
 
 
 if have_gevent:
@@ -220,19 +221,19 @@ def test_wakeup(self):
             poller = self.Poller()
             poller.register(s2, zmq.POLLIN)
 
-            tic = time.time()
+            tic = time.perf_counter()
             r = gevent.spawn(lambda: poller.poll(10000))
             s = gevent.spawn(lambda: s1.send(b'msg1'))
             r.join()
-            toc = time.time()
-            self.assertTrue(toc - tic < 1)
+            toc = time.perf_counter()
+            assert toc - tic < 1
 
         def test_socket_poll(self):
             s1, s2 = self.create_bound_pair(zmq.PAIR, zmq.PAIR)
 
-            tic = time.time()
+            tic = time.perf_counter()
             r = gevent.spawn(lambda: s2.poll(10000))
             s = gevent.spawn(lambda: s1.send(b'msg1'))
             r.join()
-            toc = time.time()
-            self.assertTrue(toc - tic < 1)
+            toc = time.perf_counter()
+            assert toc - tic < 1