Merge pull request #862 from cp2587/master

use isinstance instead of type() in verify_client_object

curator/utils.py

@@ -87,7 +87,7 @@ def verify_client_object(test):
     if str(type(test)) == "<class 'mock.Mock'>" or \
         str(type(test)) == "<class 'mock.mock.Mock'>":
         pass
-    elif not type(test) == type(elasticsearch.Elasticsearch()):
+    elif not isinstance(test, elasticsearch.Elasticsearch):
         raise TypeError(
             'Not a client object. Type: {0}'.format(type(test))
         )

test/unit/test_utils.py

@@ -602,3 +602,20 @@ def test_index_with_snapshot_filter(self):
             'delete_indices',
             [{'filtertype': 'state', 'state': 'SUCCESS'}]
         )
+
+
+class TestVerifyClientObject(TestCase):
+
+    def test_is_client_object(self):
+        test = elasticsearch.Elasticsearch()
+        self.assertIsNone(curator.verify_client_object(test))
+
+    def test_is_not_client_object(self):
+        test = 'not a client object'
+        self.assertRaises(TypeError, curator.verify_client_object, test)
+
+    def test_is_a_subclass_client_object(self):
+        class ElasticsearchSubClass(elasticsearch.Elasticsearch):
+            pass
+        test = ElasticsearchSubClass()
+        self.assertIsNone(curator.verify_client_object(test))