added pop_items to mock adapter

Author: chillaq

tests/integration/test_client_e2e.py

@@ -1194,8 +1194,9 @@ def _validate_last_events(self, client, *to_validate):
         """Validate the last N impressions are present disregarding the order."""
         event_storage = client._factory._get_storage('events')
         events_raw = []
-        if self.pluggable_storage_adapter.get(event_storage._events_queue_key) is not None:
-            events_raw = [json.loads(im) for im in self.pluggable_storage_adapter.get(event_storage._events_queue_key)]
+        stored_events = self.pluggable_storage_adapter.pop_items(event_storage._events_queue_key)
+        if stored_events is not None:
+            events_raw = [json.loads(im) for im in stored_events]
 
         as_tup_set = set(
             (i['e']['key'], i['e']['trafficTypeName'], i['e']['eventTypeId'], i['e']['value'], str(i['e']['properties']))
@@ -1207,15 +1208,15 @@ def _validate_last_impressions(self, client, *to_validate):
         """Validate the last N impressions are present disregarding the order."""
         imp_storage = client._factory._get_storage('impressions')
         impressions_raw = []
-        if self.pluggable_storage_adapter.get(imp_storage._impressions_queue_key) is not None:
-            impressions_raw = [json.loads(im) for im in self.pluggable_storage_adapter.get(imp_storage._impressions_queue_key)]
+        stored_impressions = self.pluggable_storage_adapter.pop_items(imp_storage._impressions_queue_key)
+        if stored_impressions is not None:
+            impressions_raw = [json.loads(im) for im in stored_impressions]
         as_tup_set = set(
             (i['i']['f'], i['i']['k'], i['i']['t'])
             for i in impressions_raw
         )
 
         assert as_tup_set == set(to_validate)
-        self.pluggable_storage_adapter.delete(imp_storage._impressions_queue_key)
 
     def test_get_treatment(self):
         """Test client.get_treatment()."""

tests/integration/test_pluggable_integration.py

@@ -169,7 +169,7 @@ def test_put_fetch_contains(self):
         try:
             self._put_impressions(adapter, get_metadata({}))
 
-            imps = adapter.get('SPLITIO.impressions')
+            imps = adapter.pop_items('SPLITIO.impressions')
             assert len(imps) == 3
             for rawImpression in imps:
                 impression = json.loads(rawImpression)
@@ -186,7 +186,7 @@ def test_put_fetch_contains_ip_address_disabled(self):
             cfg.update({'IPAddressesEnabled': False})
             self._put_impressions(adapter, get_metadata(cfg))
 
-            imps = adapter.get('SPLITIO.impressions')
+            imps = adapter.pop_items('SPLITIO.impressions')
             assert len(imps) == 3
             for rawImpression in imps:
                 impression = json.loads(rawImpression)
@@ -220,7 +220,7 @@ def test_put_fetch_contains(self):
         adapter = StorageMockAdapter()
         try:
             self._put_events(adapter, get_metadata({}))
-            evts = adapter.get('SPLITIO.events')
+            evts = adapter.pop_items('SPLITIO.events')
             assert len(evts) == 3
             for rawEvent in evts:
                 event = json.loads(rawEvent)
@@ -237,7 +237,7 @@ def test_put_fetch_contains_ip_address_disabled(self):
             cfg.update({'IPAddressesEnabled': False})
             self._put_events(adapter, get_metadata(cfg))
 
-            evts = adapter.get('SPLITIO.events')
+            evts = adapter.pop_items('SPLITIO.events')
             assert len(evts) == 3
             for rawEvent in evts:
                 event = json.loads(rawEvent)

tests/storage/test_pluggable.py

@@ -48,6 +48,15 @@ def delete(self, key):
             if key in self._keys:
                 del self._keys[key]
 
+    def pop_items(self, key):
+        with self._lock:
+            if key not in self._keys:
+                return None
+            items = list(self._keys[key])
+            del self._keys[key]
+            return items
+
+
     def increment(self, key, value):
         with self._lock:
             if key not in self._keys: