More deprecated assertions.

src/ZEO/tests/ConnectionTests.py

@@ -493,7 +493,7 @@ def NOcheckMultiStorageTransaction(self):
             # Wait for all threads to finish
             for t in threads:
                 t.join(60)
-                self.failIf(t.isAlive(), "%s didn't die" % t.getName())
+                self.assertFalse(t.isAlive(), "%s didn't die" % t.getName())
         finally:
             for t in threads:
                 t.closeclients()
@@ -1079,10 +1079,10 @@ def run(self):
             for c in clients:
                 # Check that we got serials for all oids
                 for oid in c.__oids:
-                    testcase.failUnless(oid in c.__serials)
+                    testcase.assertIn(oid, c.__serials)
                 # Check that we got serials for no other oids
                 for oid in c.__serials.keys():
-                    testcase.failUnless(oid in c.__oids)
+                    testcase.assertIn(oid, c.__oids)
 
     def closeclients(self):
         # Close clients opened by run()

src/ZEO/tests/testZEO.py

@@ -422,9 +422,9 @@ def checkInterfaceFromRemoteStorage(self):
         # ClientStorage itself doesn't implement IStorageIteration, but the
         # FileStorage on the other end does, and thus the ClientStorage
         # instance that is connected to it reflects this.
-        self.failIf(ZODB.interfaces.IStorageIteration.implementedBy(
+        self.assertFalse(ZODB.interfaces.IStorageIteration.implementedBy(
             ZEO.ClientStorage.ClientStorage))
-        self.failUnless(ZODB.interfaces.IStorageIteration.providedBy(
+        self.assertTrue(ZODB.interfaces.IStorageIteration.providedBy(
             self._storage))
         # This is communicated using ClientStorage's _info object:
         self.assertEqual(self._expected_interfaces,

src/ZEO/tests/testssl.py

@@ -132,16 +132,16 @@ def test_ssl_mockiavellian_server_no_ssl(self, factory, *_):
         self.assertEqual(server.acceptor.ssl_context, None)
         server.close()
 
-    def assertTruecontext(
+    def assert_context(
         self, factory, context,
         cert=(server_cert, server_key, None),
         verify_mode=ssl.CERT_REQUIRED,
         check_hostname=False,
         cafile=None, capath=None,
         ):
-        factory.assertTruecalled_with(
+        factory.assert_called_with(
             ssl.Purpose.CLIENT_AUTH, cafile=cafile, capath=capath)
-        context.load_cert_chain.assertTruecalled_with(*cert)
+        context.load_cert_chain.assert_called_with(*cert)
         self.assertEqual(context, factory.return_value)
         self.assertEqual(context.verify_mode, verify_mode)
         self.assertEqual(context.check_hostname, check_hostname)
@@ -157,15 +157,15 @@ def test_ssl_mockiavellian_server_ssl_auth_file(self, factory, *_):
         server = create_server(
             certificate=server_cert, key=server_key, authenticate=__file__)
         context = server.acceptor.ssl_context
-        self.assertTruecontext(factory, context, cafile=__file__)
+        self.assert_context(factory, context, cafile=__file__)
         server.close()
 
     @mock.patch('ssl.create_default_context')
     def test_ssl_mockiavellian_server_ssl_auth_dir(self, factory, *_):
         server = create_server(
             certificate=server_cert, key=server_key, authenticate=here)
         context = server.acceptor.ssl_context
-        self.assertTruecontext(factory, context, capath=here)
+        self.assert_context(factory, context, capath=here)
         server.close()
 
     @mock.patch('ssl.create_default_context')
@@ -177,7 +177,7 @@ def test_ssl_mockiavellian_server_ssl_pw(self, factory, *_):
             authenticate=here,
             )
         context = server.acceptor.ssl_context
-        self.assertTruecontext(
+        self.assert_context(
             factory, context, (server_cert, server_key, pwfunc), capath=here)
         server.close()
 
@@ -197,11 +197,11 @@ def test_ssl_mockiavellian_client_server_signed(
         context = ClientStorage.call_args[1]['ssl']
         self.assertEqual(ClientStorage.call_args[1]['ssl_server_hostname'],
                          None)
-        self.assertTruecontext(
+        self.assert_context(
             factory, context, (client_cert, client_key, None),
             check_hostname=True)
 
-        context.load_default_certs.assertTruecalled_with()
+        context.load_default_certs.assert_called_with()
 
     @mock.patch('ssl.create_default_context')
     @mock.patch('ZEO.ClientStorage.ClientStorage')
@@ -213,7 +213,7 @@ def test_ssl_mockiavellian_client_auth_dir(
         context = ClientStorage.call_args[1]['ssl']
         self.assertEqual(ClientStorage.call_args[1]['ssl_server_hostname'],
                          None)
-        self.assertTruecontext(
+        self.assert_context(
             factory, context, (client_cert, client_key, None),
             capath=here,
             check_hostname=True,
@@ -230,7 +230,7 @@ def test_ssl_mockiavellian_client_auth_file(
         context = ClientStorage.call_args[1]['ssl']
         self.assertEqual(ClientStorage.call_args[1]['ssl_server_hostname'],
                          None)
-        self.assertTruecontext(
+        self.assert_context(
             factory, context, (client_cert, client_key, None),
             cafile=server_cert,
             check_hostname=True,
@@ -249,7 +249,7 @@ def test_ssl_mockiavellian_client_pw(
         context = ClientStorage.call_args[1]['ssl']
         self.assertEqual(ClientStorage.call_args[1]['ssl_server_hostname'],
                          None)
-        self.assertTruecontext(
+        self.assert_context(
             factory, context, (client_cert, client_key, pwfunc),
             cafile=server_cert,
             check_hostname=True,
@@ -266,7 +266,7 @@ def test_ssl_mockiavellian_client_server_hostname(
         context = ClientStorage.call_args[1]['ssl']
         self.assertEqual(ClientStorage.call_args[1]['ssl_server_hostname'],
                          'example.com')
-        self.assertTruecontext(
+        self.assert_context(
             factory, context, (client_cert, client_key, None),
             cafile=server_cert,
             check_hostname=True,
@@ -283,7 +283,7 @@ def test_ssl_mockiavellian_client_check_hostname(
         context = ClientStorage.call_args[1]['ssl']
         self.assertEqual(ClientStorage.call_args[1]['ssl_server_hostname'],
                          None)
-        self.assertTruecontext(
+        self.assert_context(
             factory, context, (client_cert, client_key, None),
             cafile=server_cert,
             check_hostname=False,