fix failing tests

Author: jsonbailey

ldclient/impl/util.py

@@ -64,18 +64,21 @@ def validate_sdk_key_format(sdk_key: str, logger: logging.Logger) -> str:
     
     :param sdk_key: the SDK key to validate
     :param logger: the logger to use for logging warnings
-    :return: the validated SDK key, or None if the SDK key is invalid
+    :return: the validated SDK key, or empty string if the SDK key is invalid
     """
     if sdk_key is None or sdk_key == '':
-        return None
+        return ""
+
+    if not isinstance(sdk_key, str):
+        return ""
 
     if len(sdk_key) > _MAX_SDK_KEY_LENGTH:
         logger.warning('SDK key was longer than %d characters and was discarded' % _MAX_SDK_KEY_LENGTH)
-        return None
+        return ""
 
     if _VALID_CHARACTERS_REGEX.search(sdk_key):
         logger.warning('SDK key contained invalid characters and was discarded')
-        return None
+        return ""
 
     return sdk_key
 

ldclient/testing/impl/test_util.py

@@ -32,7 +32,7 @@ def test_validate_sdk_key_format_invalid():
 
     for key in invalid_keys:
         result = validate_sdk_key_format(key, logger)
-        assert result is None  # Should return None for invalid keys
+        assert result == ''  # Should return empty string for invalid keys
 
 
 def test_validate_sdk_key_format_non_string():
@@ -42,14 +42,14 @@ def test_validate_sdk_key_format_non_string():
 
     for value in non_string_values:
         result = validate_sdk_key_format(value, logger)
-        assert result is None  # Should return None for non-string values
+        assert result == ''  # Should return empty string for non-string values
 
 
 def test_validate_sdk_key_format_empty_and_none():
     """Test validation of empty and None SDK keys"""
     logger = logging.getLogger('test')
-    assert validate_sdk_key_format("", logger) is None  # Empty string should return None
-    assert validate_sdk_key_format(None, logger) is None  # None should return None
+    assert validate_sdk_key_format("", logger) == ''  # Empty string should return empty string
+    assert validate_sdk_key_format(None, logger) == ''  # None should return empty string
 
 
 def test_validate_sdk_key_format_max_length():
@@ -61,4 +61,4 @@ def test_validate_sdk_key_format_max_length():
 
     invalid_key = "a" * 8193
     result = validate_sdk_key_format(invalid_key, logger)
-    assert result is None  # Should return None for keys that are too long
+    assert result == ''  # Should return empty string for keys that are too long

ldclient/testing/test_config.py

@@ -73,7 +73,7 @@ def test_sdk_key_validation_invalid_keys():
 
     for key in invalid_keys:
         config = Config(sdk_key=key)
-        assert config.sdk_key is None
+        assert config.sdk_key == ''
 
 
 def test_sdk_key_validation_empty_key():
@@ -85,7 +85,7 @@ def test_sdk_key_validation_empty_key():
 def test_sdk_key_validation_none_key():
     """Test that None SDK keys are accepted"""
     config = Config(sdk_key=None)
-    assert config.sdk_key is None
+    assert config.sdk_key == ''
 
 
 def test_sdk_key_validation_max_length():
@@ -96,7 +96,7 @@ def test_sdk_key_validation_max_length():
 
     invalid_key = "a" * 8193
     config = Config(sdk_key=invalid_key)
-    assert config.sdk_key is None
+    assert config.sdk_key == ''
 
 
 def test_copy_with_new_sdk_key_validation():
@@ -107,7 +107,7 @@ def test_copy_with_new_sdk_key_validation():
     assert new_config.sdk_key == "another-valid-key"
 
     invalid_config = original_config.copy_with_new_sdk_key("invalid key with spaces")
-    assert invalid_config.sdk_key is None
+    assert invalid_config.sdk_key == ''
 
 
 def application_can_be_set_and_read():