cached_schema_registry_client: Fix bug where test_compatibility() would return None (instead of the expected False value) when unable to check compatibility (confluentinc#372, @Enether)

stanislavkozlovski · edenhill · commit 3546419bc05f · 2018-05-29T09:04:52.000+02:00
* cached_schema_registry_client: Fix bug where `test_compatibility()` would return `None` (instead of the expected `False` value) when unable to check compatibility

* Also log response code

* cached_schema_registry_client: Update get_compatibility() to the latest API specification
diff --git a/confluent_kafka/avro/cached_schema_registry_client.py b/confluent_kafka/avro/cached_schema_registry_client.py
@@ -267,8 +267,8 @@ def test_compatibility(self, subject, avro_schema, version='latest'):
             elif code >= 200 and code <= 299:
                 return result.get('is_compatible')
             else:
-                log.error("Unable to check the compatibility")
-                False
+                log.error("Unable to check the compatibility: " + str(code))
+                return False
         except Exception as e:
             log.error("_send_request() failed: %s", e)
             return False
@@ -301,17 +301,24 @@ def get_compatibility(self, subject=None):
         Get the current compatibility level for a subject.  Result will be one of:
 
         @:param: subject: subject name
+        @:raises: ClientError: if the request was unsuccessful or an invalid compatibility level was returned
         @:return: 'NONE','FULL','FORWARD', or 'BACKWARD'
         """
         url = '/'.join([self.url, 'config'])
         if subject:
             url += '/' + subject
 
         result, code = self._send_request(url)
-        if code >= 200 and code <= 299:
-            compatibility = result.get('compatibility', None)
-
-        if not compatibility:
-            compatibility = result.get('compatibilityLevel')
+        is_successful_request = code >= 200 and code <= 299
+        if not is_successful_request:
+            raise ClientError('Unable to fetch compatibility level. Error code: %d' % code)
+
+        compatibility = result.get('compatibility', None)
+        if compatibility not in VALID_LEVELS:
+            if compatibility is None:
+                error_msg_suffix = 'No compatibility was returned'
+            else:
+                error_msg_suffix = str(compatibility)
+            raise ClientError('Invalid compatibility level received: %s' % error_msg_suffix)
 
         return compatibility
