Merge pull request #1666 from minrk/bare-asserts

FMT: use bare asserts to let pytest handle reporting

Author: minrk

zmq/tests/test_asyncio.py

@@ -90,7 +90,7 @@ async def test():
             assert not f.done()
             await a.send(b"hi")
             recvd = await f
-            self.assertEqual(recvd, [b"hi"])
+            assert recvd == [b"hi"]
 
         self.loop.run_until_complete(test())
 
@@ -104,8 +104,8 @@ async def test():
             await a.send_multipart([b"hi", b"there"])
             recvd = await f2
             assert f1.done()
-            self.assertEqual(f1.result(), b"hi")
-            self.assertEqual(recvd, b"there")
+            assert f1.result() == b"hi"
+            assert recvd == b"there"
 
         self.loop.run_until_complete(test())
 
@@ -122,7 +122,7 @@ async def test():
             await a.send_multipart([b"hi", b"there"])
             recvd = await f2
             assert f2.done()
-            self.assertEqual(recvd, [b"hi", b"there"])
+            assert recvd == [b"hi", b"there"]
 
         self.loop.run_until_complete(test())
 
@@ -145,8 +145,8 @@ async def test():
             await a.send_string(msg)
             recvd = await f
             assert f.done()
-            self.assertEqual(f.result(), msg)
-            self.assertEqual(recvd, msg)
+            assert f.result() == msg
+            assert recvd == msg
 
         self.loop.run_until_complete(test())
 
@@ -159,8 +159,8 @@ async def test():
             await a.send_json(obj)
             recvd = await f
             assert f.done()
-            self.assertEqual(f.result(), obj)
-            self.assertEqual(recvd, obj)
+            assert f.result() == obj
+            assert recvd == obj
 
         self.loop.run_until_complete(test())
 
@@ -202,8 +202,8 @@ async def test():
             await a.send_pyobj(obj)
             recvd = await f
             assert f.done()
-            self.assertEqual(f.result(), obj)
-            self.assertEqual(recvd, obj)
+            assert f.result() == obj
+            assert recvd == obj
 
         self.loop.run_until_complete(test())
 
@@ -274,7 +274,7 @@ async def test():
             f = pull.recv(zmq.DONTWAIT)
             assert f.done()
             msg = await f
-            self.assertEqual(msg, b"ping")
+            assert msg == b"ping"
 
         self.loop.run_until_complete(test())
 
@@ -290,7 +290,7 @@ async def test():
             recvd = await f2
             assert f1.cancelled()
             assert f2.done()
-            self.assertEqual(recvd, [b"hi", b"there"])
+            assert recvd == [b"hi", b"there"]
 
         self.loop.run_until_complete(test())
 
@@ -299,21 +299,21 @@ async def test():
             a, b = self.create_bound_pair(zmq.PUSH, zmq.PULL)
             f = b.poll(timeout=0)
             await asyncio.sleep(0)
-            self.assertEqual(f.result(), 0)
+            assert f.result() == 0
 
             f = b.poll(timeout=1)
             assert not f.done()
             evt = await f
 
-            self.assertEqual(evt, 0)
+            assert evt == 0
 
             f = b.poll(timeout=1000)
             assert not f.done()
             await a.send_multipart([b"hi", b"there"])
             evt = await f
-            self.assertEqual(evt, zmq.POLLIN)
+            assert evt == zmq.POLLIN
             recvd = await b.recv_multipart()
-            self.assertEqual(recvd, [b"hi", b"there"])
+            assert recvd == [b"hi", b"there"]
 
         self.loop.run_until_complete(test())
 
@@ -334,9 +334,9 @@ async def test():
             assert not f.done()
             a.send_multipart([b"hi", b"there"])
             evt = await f
-            self.assertEqual(evt, [(b, zmq.POLLIN)])
+            assert evt == [(b, zmq.POLLIN)]
             recvd = b.recv_multipart()
-            self.assertEqual(recvd, [b"hi", b"there"])
+            assert recvd == [b"hi", b"there"]
 
         self.loop.run_until_complete(test())
 

zmq/tests/test_auth.py

@@ -124,7 +124,7 @@ def can_connect(self, server, client):
             except zmq.Again:
                 warnings.warn("client set POLLIN, but cannot recv", RuntimeWarning)
             else:
-                self.assertEqual(rcvd_msg, msg)
+                assert rcvd_msg == msg
                 result = True
         return result
 
@@ -139,15 +139,15 @@ def test_null(self):
 
         server = self.socket(zmq.PUSH)
         client = self.socket(zmq.PULL)
-        self.assertTrue(self.can_connect(server, client))
+        assert self.can_connect(server, client)
 
         # By setting a domain we switch on authentication for NULL sockets,
         # though no policies are configured yet. The client connection
         # should still be allowed.
         server = self.socket(zmq.PUSH)
         server.zap_domain = b'global'
         client = self.socket(zmq.PULL)
-        self.assertTrue(self.can_connect(server, client))
+        assert self.can_connect(server, client)
 
     def test_blacklist(self):
         """threaded auth - Blacklist"""
@@ -158,7 +158,7 @@ def test_blacklist(self):
         # though no policies are configured yet.
         server.zap_domain = b'global'
         client = self.socket(zmq.PULL)
-        self.assertFalse(self.can_connect(server, client))
+        assert not self.can_connect(server, client)
 
     def test_whitelist(self):
         """threaded auth - Whitelist"""
@@ -169,7 +169,7 @@ def test_whitelist(self):
         # though no policies are configured yet.
         server.zap_domain = b'global'
         client = self.socket(zmq.PULL)
-        self.assertTrue(self.can_connect(server, client))
+        assert self.can_connect(server, client)
 
     def test_plain(self):
         """threaded auth - PLAIN"""
@@ -180,7 +180,7 @@ def test_plain(self):
         client = self.socket(zmq.PULL)
         client.plain_username = b'admin'
         client.plain_password = b'Password'
-        self.assertFalse(self.can_connect(server, client))
+        assert not self.can_connect(server, client)
 
         # Try PLAIN authentication - with server configured, connection should pass
         server = self.socket(zmq.PUSH)
@@ -189,23 +189,23 @@ def test_plain(self):
         client.plain_username = b'admin'
         client.plain_password = b'Password'
         self.auth.configure_plain(domain='*', passwords={'admin': 'Password'})
-        self.assertTrue(self.can_connect(server, client))
+        assert self.can_connect(server, client)
 
         # Try PLAIN authentication - with bogus credentials, connection should fail
         server = self.socket(zmq.PUSH)
         server.plain_server = True
         client = self.socket(zmq.PULL)
         client.plain_username = b'admin'
         client.plain_password = b'Bogus'
-        self.assertFalse(self.can_connect(server, client))
+        assert not self.can_connect(server, client)
 
         # Remove authenticator and check that a normal connection works
         self.auth.stop()
         self.auth = None
 
         server = self.socket(zmq.PUSH)
         client = self.socket(zmq.PULL)
-        self.assertTrue(self.can_connect(server, client))
+        assert self.can_connect(server, client)
         client.close()
         server.close()
 
@@ -224,7 +224,7 @@ def test_curve(self):
         client.curve_publickey = client_public
         client.curve_secretkey = client_secret
         client.curve_serverkey = server_public
-        self.assertFalse(self.can_connect(server, client))
+        assert not self.can_connect(server, client)
 
         # Try CURVE authentication - with server configured to CURVE_ALLOW_ANY, connection should pass
         self.auth.configure_curve(domain='*', location=zmq.auth.CURVE_ALLOW_ANY)
@@ -236,7 +236,7 @@ def test_curve(self):
         client.curve_publickey = client_public
         client.curve_secretkey = client_secret
         client.curve_serverkey = server_public
-        self.assertTrue(self.can_connect(server, client))
+        assert self.can_connect(server, client)
 
         # Try CURVE authentication - with server configured, connection should pass
         self.auth.configure_curve(domain='*', location=self.public_keys_dir)
@@ -257,7 +257,7 @@ def test_curve(self):
         # Try connecting using NULL and no authentication enabled, connection should pass
         server = self.socket(zmq.PUSH)
         client = self.socket(zmq.PULL)
-        self.assertTrue(self.can_connect(server, client))
+        assert self.can_connect(server, client)
 
     def test_curve_callback(self):
         """threaded auth - CURVE with callback authentication"""
@@ -274,7 +274,7 @@ def test_curve_callback(self):
         client.curve_publickey = client_public
         client.curve_secretkey = client_secret
         client.curve_serverkey = server_public
-        self.assertFalse(self.can_connect(server, client))
+        assert not self.can_connect(server, client)
 
         # Try CURVE authentication - with callback authentication configured, connection should pass
 
@@ -298,7 +298,7 @@ def callback(self, domain, key):
         client.curve_publickey = client_public
         client.curve_secretkey = client_secret
         client.curve_serverkey = server_public
-        self.assertTrue(self.can_connect(server, client))
+        assert self.can_connect(server, client)
 
         # Try CURVE authentication - with callback authentication configured with wrong key, connection should not pass
 
@@ -322,7 +322,7 @@ def callback(self, domain, key):
         client.curve_publickey = client_public
         client.curve_secretkey = client_secret
         client.curve_serverkey = server_public
-        self.assertFalse(self.can_connect(server, client))
+        assert not self.can_connect(server, client)
 
     @skip_pypy
     def test_curve_user_id(self):