Merge branch 'main' into DiskStorage

Author: nedtwigg

python/example-pytest-selfie/poetry.lock

@@ -0,0 +1,6 @@
+from selfie_lib.Selfie import cache_selfie_string
+import random
+
+
+def test_cache_selfie():
+    cache_selfie_string(lambda: str(random.random())).to_be("0.6623096709843852")

python/example-pytest-selfie/tests/cache_selfie_test.py

@@ -35,20 +35,29 @@ def assert_failed(self, message, expected=None, actual=None) -> Exception:
         if expected is None and actual is None:
             return AssertionError(message)
 
-        on_null = ""
-        expected_str = self.__nullable_to_string(expected, on_null)
-        actual_str = self.__nullable_to_string(actual, on_null)
-
-        if expected_str != actual_str:
+        expected_str = self.__nullable_to_string(expected, "")
+        actual_str = self.__nullable_to_string(actual, "")
+
+        if not expected_str and not actual_str and (expected is None or actual is None):
+            on_null = "(null)"
+            return self.__comparison_assertion(
+                message,
+                self.__nullable_to_string(expected, on_null),
+                self.__nullable_to_string(actual, on_null),
+            )
+        else:
             return self.__comparison_assertion(message, expected_str, actual_str)
-        return AssertionError(message)
 
-    def __nullable_to_string(self, value, on_null):
+    def __nullable_to_string(self, value, on_null: str) -> str:
         return str(value) if value is not None else on_null
 
-    def __comparison_assertion(self, message, expected, actual) -> Exception:
-        error_message = f"{message} - Expected: {expected}, Actual: {actual}"
-        return AssertionError(error_message)
+    def __comparison_assertion(
+        self, message: str, expected: str, actual: str
+    ) -> Exception:
+        # this *should* through an exception that a good pytest runner will show nicely
+        assert expected == actual, message
+        # but in case it doesn't, we'll create our own here
+        return AssertionError(message)
 
 
 class PytestSnapshotFileLayout(SnapshotFileLayout):