[master] use assertTrue+isinstance instead of assertIsInstance.

the latter is relatively new and doesn't work for all of our supported
python versions.  will fix a buildbot report.  committing at my discretion.

diff --git a/src/bin/cmdctl/tests/cmdctl_test.py b/src/bin/cmdctl/tests/cmdctl_test.py
index cab89f843dc9f5e55f9982b352ba9d6f435a4cbd..ee44f45b2cee46b8e3b81c8a99a106d3cb16e5a2 100644 (file)
--- a/src/bin/cmdctl/tests/cmdctl_test.py
+++ b/src/bin/cmdctl/tests/cmdctl_test.py
@@ -533,7 +533,7 @@ class TestSecureHTTPServer(unittest.TestCase):
         ssl_sock = self.server._wrap_socket_in_ssl_context(sock1,
                                    BUILD_FILE_PATH + 'cmdctl-keyfile.pem',
                                    BUILD_FILE_PATH + 'cmdctl-certfile.pem')
-        self.assertIsInstance(ssl_sock, ssl.SSLSocket)
+        self.assertTrue(isinstance(ssl_sock, ssl.SSLSocket))
 
         # wrap_socket can also raise IOError, which should be caught and
         # handled like the other errors.