fast forward, resolve conflicts

Author: rnpridgeon

confluent_kafka/avro/cached_schema_registry_client.py

@@ -110,10 +110,6 @@ def __init__(self, url, max_schemas_per_subject=1000, ca_location=None, cert_loc
         s.cert = self._configure_client_tls(conf)
         s.auth = self._configure_basic_auth(conf)
 
-        retries = Retry(connect=10, read=10, backoff_factor=.5)
-        s.mount('http://', HTTPAdapter(max_retries=retries))
-        s.mount('https://', HTTPAdapter(max_retries=retries))
-
         self.url = conf.pop('url')
         self._session = s
 

docker/bin/cluster_up.sh

@@ -1,5 +1,4 @@
-#!/usr/bin/env bash
-set -eu
+#!/usr/bin/env bash -eu
 
 DOCKER_BIN="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null && pwd )"
 source ${DOCKER_BIN}/../.env

tests/integration/run.sh renamed to tests/run.sh

@@ -7,7 +7,7 @@ cleanup() {
 trap cleanup 0 2 3 6 15
 
 TEST_SOURCE="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null && pwd )"
-source ${TEST_SOURCE}/../../docker/.env
+source ${TEST_SOURCE}/../docker/.env
 
 if [[ ${1:-} == "help" ]]; then
     python ${TEST_SOURCE}/integration/integration_test.py --help