Merge pull request #97 from launchdarkly/6.4.1

prepare 6.4.1 release

Author: eli-darkly

scripts/release.sh

@@ -21,6 +21,11 @@ SETUP_PY_TEMP=./setup.py.tmp
 sed "s/ldclient_version=.*/ldclient_version='${VERSION}'/g" setup.py > ${SETUP_PY_TEMP}
 mv ${SETUP_PY_TEMP} setup.py
 
-python setup.py sdist upload
+# Prepare distribution
+python setup.py sdist
+
+# Upload with Twine
+pip install twine
+twine upload dist/*
 
 echo "Done with python-client release"

test-requirements.txt

@@ -1,6 +1,7 @@
 mock>=2.0.0
 pytest>=2.8
 redis>=2.10.5
-coverage>=4.3.4,<4.4
+coverage>=4.4
+pytest-capturelog>=0.7
 pytest-cov>=2.4.0
 codeclimate-test-reporter>=0.2.1

testing/test_feature_store.py

@@ -8,6 +8,14 @@
 from ldclient.versioned_data_kind import FEATURES
 
 
+def get_log_lines(caplog):
+    loglines = caplog.records
+    if callable(loglines):
+        # records() is a function in older versions of the caplog plugin
+        loglines = loglines()
+    return loglines
+
+
 class TestFeatureStore:
     redis_host = 'localhost'
     redis_port = 6379
@@ -162,3 +170,25 @@ def hook(base_key, key):
         store.upsert(FEATURES, feature)
         result = store.get(FEATURES, 'flagkey', lambda x: x)
         assert result['version'] == 5
+
+    def test_exception_is_handled_in_get(self, caplog):
+        # This just verifies the fix for a bug that caused an error during exception handling in Python 3
+        store = RedisFeatureStore(url='redis://bad')
+        feature = store.get(FEATURES, 'flagkey')
+        assert feature is None
+        loglines = get_log_lines(caplog)
+        assert len(loglines) == 2
+        message = loglines[1].message
+        assert message.startswith("RedisFeatureStore: Could not retrieve key flagkey from 'features' with error:")
+        assert "connecting to bad:6379" in message
+
+    def test_exception_is_handled_in_all(self, caplog):
+        # This just verifies the fix for a bug that caused an error during exception handling in Python 3
+        store = RedisFeatureStore(url='redis://bad')
+        all = store.all(FEATURES, lambda x: x)
+        assert all is None
+        loglines = get_log_lines(caplog)
+        assert len(loglines) == 2
+        message = loglines[1].message
+        assert message.startswith("RedisFeatureStore: Could not retrieve 'features' from Redis")
+        assert "connecting to bad:6379" in message