From: JINMEI Tatuya <jinmei@isc.org>
Date: Thu, 24 Jan 2013 23:35:00 +0000 (-0800)
Subject: [master] use assertTrue+isinstance instead of assertIsInstance.
X-Git-Tag: bind10-1.0.0-rc-release~76^2~8^2^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f969ebef7a0d51d33c9c2eb3f034ad25bda2f4f3;p=thirdparty%2Fkea.git

[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 cab89f843d..ee44f45b2c 100644
--- 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.