address review comments

Author: rnpridgeon

confluent_kafka/avro/cached_schema_registry_client.py

@@ -72,7 +72,6 @@ def __init__(self, url, max_schemas_per_subject=1000, ca_location=None, cert_loc
         # In order to maintain compatibility the url(conf in future versions) param has been preserved for now.
         conf = url
         if not isinstance(url, dict):
-
             conf = {
                 'url': url,
                 'ssl.ca.location': ca_location,
@@ -91,7 +90,10 @@ def __init__(self, url, max_schemas_per_subject=1000, ca_location=None, cert_loc
 
         # Ensure URL valid scheme is included; http[s]
         url = conf.get('url', '')
-        if not isinstance(url, string_types) or not url.startswith('http'):
+        if not isinstance(url, string_types):
+            raise TypeError("URL must be of type str")
+
+        if not url.startswith('http'):
             raise ValueError("Invalid URL provided for Schema Registry")
 
         # subj => { schema => id }

docker/conf/schema-registry/login.properties

@@ -0,0 +1 @@
+ckp_tester:test_secret, Testers

docker/conf/schema-registry/schema-registry.jaas

@@ -0,0 +1,4 @@
+SchemaRegistry {
+    org.eclipse.jetty.jaas.spi.PropertyFileLoginModule required
+    file="/conf/schema-registry/login.properties";
+  };

docker/docker-compose.yaml

@@ -1,7 +1,7 @@
 version: '3'
 services:
   zookeeper:
-    image: confluentinc/cp-zookeeper
+    image: confluentinc/cp-zookeeper:5.0.0
     ports:
       - 2181:2181
     environment:
@@ -19,7 +19,7 @@ services:
       KAFKA_ZOOKEEPER_CONNECT: zookeeper:2181
       KAFKA_OFFSETS_TOPIC_REPLICATION_FACTOR: 1
   schema-registry:
-    image: confluentinc/cp-schema-registry
+    image: confluentinc/cp-schema-registry:5.0.0
     depends_on:
     - zookeeper
     - kafka
@@ -40,7 +40,7 @@ services:
       SCHEMA_REGISTRY_SSL_TRUSTSTORE_PASSWORD: abcdefgh
       SCHEMA_REGISTRY_KAFKASTORE_CONNECTION_URL: zookeeper:2181
   schema-registry-basic-auth:
-    image: confluentinc/cp-schema-registry
+    image: confluentinc/cp-schema-registry:5.0.0
     depends_on:
       - zookeeper
       - kafka

tests/README.md

@@ -39,7 +39,9 @@ Advanced users can reference the provided configuration file, [testconf.json](in
 Most developers however should use the defaults.
 
 ### Running tests
-To run the entire test suite:
+To run the entire test suite: 
+
+From the source root directory ...
 
 - With tox installed (will run against all supported interpreters)
   1. Uncomment the following line from [tox.ini](../tox.ini)
@@ -48,16 +50,21 @@ To run the entire test suite:
     - ```./tests/run.sh tox [options]```
 
 - Without tox (will run against current interpreter)
-  - ```./tests/run.sh```
+  - ```./tests/run.sh all```
+
+
+To run just the unit tests
+
+    ./tests/run.sh unit
 
-To run a specific `mode` or set of `modes` use the following syntax
+To run a specific integration test `mode` or set of `modes` use the following syntax
 
     ./tests/run.sh <test mode 1> <test mode 2>..
 
 For example:
 
     ./tests/run.sh producer consumer
 
-To get a list of `modes` simply supply the `help` option
+To get a list of integration test `modes` simply supply the `help` option
 
     ./tests/run.sh help

tests/avro/test_cached_client.py

@@ -164,12 +164,12 @@ def test_empty_url(self):
             })
 
     def test_invalid_type_url(self):
-        with self.assertRaises(ValueError):
+        with self.assertRaises(TypeError):
             self.client = CachedSchemaRegistryClient(
                 url=1)
 
     def test_invalid_type_url_dict(self):
-        with self.assertRaises(ValueError):
+        with self.assertRaises(TypeError):
             self.client = CachedSchemaRegistryClient({
                 "url": 1
                 })