@@ -42,7 +42,7 @@ def test_filebackend_ping_fails(caplog, tmp_path):
42
42
43
43
44
44
@pytest .mark .asyncio
45
- async def test_remove_last_item (backend : QueueBackend , queue_item_factory ):
45
+ async def test_backend_remove_last_item (backend : QueueBackend , queue_item_factory ):
46
46
"""When we remove the last item for a bug, we also remove it's key from the
47
47
backend"""
48
48
@@ -56,7 +56,7 @@ async def test_remove_last_item(backend: QueueBackend, queue_item_factory):
56
56
57
57
58
58
@pytest .mark .asyncio
59
- async def test_clear (backend : QueueBackend , queue_item_factory ):
59
+ async def test_backend_clear (backend : QueueBackend , queue_item_factory ):
60
60
item_1 = queue_item_factory (payload__bug__id = 123 )
61
61
item_2 = queue_item_factory (payload__bug__id = 456 )
62
62
@@ -69,7 +69,9 @@ async def test_clear(backend: QueueBackend, queue_item_factory):
69
69
70
70
71
71
@pytest .mark .asyncio
72
- async def test_put_maintains_sorted_order (backend : QueueBackend , queue_item_factory ):
72
+ async def test_backend_put_maintains_sorted_order (
73
+ backend : QueueBackend , queue_item_factory
74
+ ):
73
75
now = datetime .now ()
74
76
item_1 = queue_item_factory (payload__event__time = now + timedelta (minutes = 1 ))
75
77
item_2 = queue_item_factory (payload__event__time = now + timedelta (minutes = 2 ))
@@ -86,40 +88,7 @@ async def test_put_maintains_sorted_order(backend: QueueBackend, queue_item_fact
86
88
87
89
88
90
@pytest .mark .asyncio
89
- async def test_backend_list (backend : QueueBackend , queue_item_factory ):
90
- item = queue_item_factory (payload__bug__id = 123 )
91
- await backend .put (item )
92
- await backend .put (queue_item_factory (payload__bug__id = 456 ))
93
-
94
- [identifier ] = await backend .list (123 )
95
- assert item .identifier == identifier
96
-
97
-
98
- @pytest .mark .asyncio
99
- async def test_backend_list_all (backend : QueueBackend , queue_item_factory ):
100
- for bug_id in (123 , 123 , 456 , 456 ):
101
- await backend .put (queue_item_factory (payload__bug__id = bug_id ))
102
-
103
- all_items = await backend .list_all ()
104
- assert len (all_items ) == 2
105
-
106
- for items in all_items .values ():
107
- assert len (items ) == 2
108
-
109
-
110
- @pytest .mark .asyncio
111
- async def test_list_by_bug (backend : QueueBackend , queue_item_factory ):
112
- item_1 = queue_item_factory (payload__bug__id = 123 )
113
- item_2 = queue_item_factory (payload__bug__id = 456 )
114
-
115
- await backend .put (item_1 )
116
- await backend .put (item_2 )
117
- [identifier ] = await backend .list (bug_id = 123 )
118
- assert identifier == item_1 .identifier
119
-
120
-
121
- @pytest .mark .asyncio
122
- async def test_list_ordering (backend : QueueBackend , queue_item_factory ):
91
+ async def test_backend_get_ordering (backend : QueueBackend , queue_item_factory ):
123
92
now = datetime .now ()
124
93
item_1 = queue_item_factory (payload__event__time = now + timedelta (minutes = 1 ))
125
94
item_2 = queue_item_factory (payload__event__time = now + timedelta (minutes = 2 ))
@@ -131,13 +100,15 @@ async def test_list_ordering(backend: QueueBackend, queue_item_factory):
131
100
await backend .put (item_3 )
132
101
await backend .put (item_4 )
133
102
134
- item_metadata = await backend .list (bug_id = item_1 .payload .bug .id )
103
+ item_metadata = [
104
+ item .identifier async for item in backend .get (bug_id = item_1 .payload .bug .id )
105
+ ]
135
106
exptected_id_order = [item .identifier for item in [item_1 , item_2 , item_3 , item_4 ]]
136
107
assert exptected_id_order == item_metadata
137
108
138
109
139
110
@pytest .mark .asyncio
140
- async def test_get_all (backend : QueueBackend , queue_item_factory ):
111
+ async def test_backend_get_all (backend : QueueBackend , queue_item_factory ):
141
112
now = datetime .now ()
142
113
item_1 = queue_item_factory (
143
114
payload__bug__id = 123 , payload__event__time = now + timedelta (minutes = 1 )
@@ -164,7 +135,7 @@ async def test_get_all(backend: QueueBackend, queue_item_factory):
164
135
165
136
166
137
@pytest .mark .asyncio
167
- async def test_get_all_invalid_json (backend : QueueBackend , queue_item_factory ):
138
+ async def test_backend_get_all_invalid_json (backend : QueueBackend , queue_item_factory ):
168
139
item_1 = queue_item_factory ()
169
140
await backend .put (item_1 )
170
141
@@ -179,7 +150,7 @@ async def test_get_all_invalid_json(backend: QueueBackend, queue_item_factory):
179
150
180
151
181
152
@pytest .mark .asyncio
182
- async def test_get_all_payload_doesnt_match_schema (
153
+ async def test_backend_get_all_payload_doesnt_match_schema (
183
154
backend : QueueBackend , queue_item_factory
184
155
):
185
156
item_1 = queue_item_factory ()
@@ -196,7 +167,7 @@ async def test_get_all_payload_doesnt_match_schema(
196
167
197
168
198
169
@pytest .mark .asyncio
199
- async def test_get_invalid_json (backend : QueueBackend , queue_item_factory ):
170
+ async def test_backend_get_invalid_json (backend : QueueBackend , queue_item_factory ):
200
171
corrupt_file_dir = backend .location / "999"
201
172
corrupt_file_dir .mkdir ()
202
173
corrupt_file_path = corrupt_file_dir / "xxx.json"
@@ -207,8 +178,7 @@ async def test_get_invalid_json(backend: QueueBackend, queue_item_factory):
207
178
with pytest .raises (QueueItemRetrievalError ):
208
179
await anext (items )
209
180
210
-
211
- @pytest .mark .asyncio
181
+
212
182
async def test_get_missing_timezone (backend : QueueBackend , queue_item_factory ):
213
183
item = queue_item_factory .build (payload__bug__id = 666 )
214
184
dump = item .model_dump ()
@@ -226,8 +196,7 @@ async def test_get_missing_timezone(backend: QueueBackend, queue_item_factory):
226
196
assert "2024-04-18T12:46:54Z" in item .model_dump_json (), "timezone put in dump"
227
197
228
198
229
- @pytest .mark .asyncio
230
- async def test_get_payload_doesnt_match_schema (
199
+ async def test_backend_get_payload_doesnt_match_schema (
231
200
backend : QueueBackend , queue_item_factory
232
201
):
233
202
# this is invalid, as whiteboard should be a string
@@ -348,25 +317,3 @@ async def test_done(queue: DeadLetterQueue, queue_item_factory):
348
317
349
318
await queue .done (item )
350
319
assert await queue .backend .size () == 0
351
-
352
-
353
- @pytest .mark .asyncio
354
- async def test_queue_list (queue : DeadLetterQueue , queue_item_factory ):
355
- item = queue_item_factory (payload__bug__id = 123 )
356
- await queue .backend .put (item )
357
- await queue .backend .put (queue_item_factory (payload__bug__id = 456 ))
358
-
359
- [identifier ] = await queue .list (123 )
360
- assert item .identifier == identifier
361
-
362
-
363
- @pytest .mark .asyncio
364
- async def test_queue_list_all (queue : DeadLetterQueue , queue_item_factory ):
365
- for bug_id in (123 , 123 , 456 , 456 ):
366
- await queue .backend .put (queue_item_factory (payload__bug__id = bug_id ))
367
-
368
- all_items = await queue .list_all ()
369
- assert len (all_items ) == 2
370
-
371
- for items in all_items .values ():
372
- assert len (items ) == 2
0 commit comments