Add coverage for the flag buffer on scope fork

Author: cmanallen

sentry_sdk/scope.py

@@ -1,7 +1,7 @@
 import os
 import sys
 import warnings
-from copy import copy
+from copy import copy, deepcopy
 from collections import deque
 from contextlib import contextmanager
 from enum import Enum
@@ -252,7 +252,7 @@ def __copy__(self):
 
         rv._last_event_id = self._last_event_id
 
-        rv._flags = copy(self._flags)
+        rv._flags = deepcopy(self._flags)
 
         return rv
 

tests/test_lru_cache.py

@@ -1,5 +1,4 @@
 import pytest
-from copy import copy
 
 from sentry_sdk._lru_cache import LRUCache
 
@@ -59,29 +58,3 @@ def test_cache_get_all():
     assert cache.get_all() == [(1, 1), (2, 2), (3, 3)]
     cache.get(1)
     assert cache.get_all() == [(2, 2), (3, 3), (1, 1)]
-
-
-def test_cache_copy():
-    cache = LRUCache(3)
-    cache.set(0, 0)
-    cache.set(1, 1)
-
-    copied = copy(cache)
-    cache.set(2, 2)
-    cache.set(3, 3)
-    assert copied.get_all() == [(0, 0), (1, 1)]
-    assert cache.get_all() == [(1, 1), (2, 2), (3, 3)]
-
-    copied = copy(cache)
-    cache.get(1)
-    assert copied.get_all() == [(1, 1), (2, 2), (3, 3)]
-    assert cache.get_all() == [(2, 2), (3, 3), (1, 1)]
-
-
-def test_cache_no_overwrites_to_parent():
-    cache1 = LRUCache(max_size=2)
-    cache1.set(1, True)
-    cache2 = cache1.__copy__()
-    cache2.set(1, False)
-    assert cache1.get(1) is True
-    assert cache2.get(1) is False

tests/test_scope.py

@@ -43,6 +43,22 @@ def test_all_slots_copied():
         assert getattr(scope_copy, attr) == getattr(scope, attr)
 
 
+def test_scope_flags_copy():
+    # A scope exists and a flag is appended to it.
+    old_scope = Scope()
+    old_scope.flags.set("a", True)
+
+    # Scope is forked; flag buffer is copied and contains the data of
+    # the parent. The flag is overwritten.
+    new_scope = old_scope.fork()
+    new_scope.flags.set("a", False)
+
+    # New scope has the change. Old scope was not polluted by changes
+    # to the new scope.
+    old_scope.flags.get() == [{"flag": "a", "result": True}]
+    new_scope.flags.get() == [{"flag": "a", "result": False}]
+
+
 def test_merging(sentry_init, capture_events):
     sentry_init()