From d930a7c851743019d100fd5782590ee289337659 Mon Sep 17 00:00:00 2001
From: Robert Escriva <robert@trychroma.com>
Date: Wed, 2 Sep 2026 12:55:14 -0700
Subject: [PATCH] [TST] Make work queue integration test order-agnostic

The live fn-consumer can defer an item while this test runs, moving
it to the back of the queue and breaking the previous FIFO-order
assertion. Verify each retrieved item by matching its fn_id to the
expected completion offset instead of relying on push order.

Rename the test to test_k8s_integration_work_queue_enqueue_and_filtering
to reflect that it checks enqueue and filtering rather than FIFO
ordering, which remains covered by the QueueState unit tests.

Co-authored-by: AI
---
 .../src/work_queue/tests/integration.rs       | 22 ++++++++++---------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/rust/worker/src/work_queue/tests/integration.rs b/rust/worker/src/work_queue/tests/integration.rs
index c402673ba98..d4772158010 100644
--- a/rust/worker/src/work_queue/tests/integration.rs
+++ b/rust/worker/src/work_queue/tests/integration.rs
@@ -355,7 +355,7 @@ mod tests {
     }
 
     #[tokio::test]
-    async fn test_k8s_integration_work_queue_fifo_and_filtering() {
+    async fn test_k8s_integration_work_queue_enqueue_and_filtering() {
         with_work_queue_test(|mut ctx| async move {
             let mut work_items = Vec::new();
 
@@ -383,7 +383,7 @@ mod tests {
                 work_items.push((fn_id, coll_id, offset));
             }
 
-            // Get work - should return in FIFO order
+            // Get work and verify that all of our items are still queued.
             let retrieved = ctx
                 .work_queue_client
                 .get_work_with_failure_limit(ctx.fn_consumer_shard_id.clone(), 10, i32::MAX)
@@ -393,15 +393,15 @@ mod tests {
             println!("Got {} work items total", retrieved.items.len());
 
             // Filter to only our test items
-            let our_fn_ids: std::collections::HashSet<String> = work_items
+            let expected_offsets: std::collections::HashMap<String, i64> = work_items
                 .iter()
-                .map(|(fn_id, _, _)| fn_id.to_string())
+                .map(|(fn_id, _, offset)| (fn_id.to_string(), *offset))
                 .collect();
 
             let our_retrieved: Vec<_> = retrieved
                 .items
                 .iter()
-                .filter(|item| our_fn_ids.contains(&item.fn_id))
+                .filter(|item| expected_offsets.contains_key(&item.fn_id))
                 .collect();
 
             assert_eq!(
@@ -410,13 +410,15 @@ mod tests {
                 "Expected 3 work items for our functions"
             );
 
-            // Check FIFO order by completion offset (assuming same order as pushed)
-            for (i, item) in our_retrieved.iter().enumerate() {
-                let expected_offset = work_items[i].2;
+            // The live fn-consumer can defer an item while this test is
+            // running, which intentionally moves it to the back of the queue.
+            // FIFO ordering itself is covered by the QueueState unit tests.
+            for item in our_retrieved {
+                let expected_offset = expected_offsets[&item.fn_id];
                 assert_eq!(
                     item.completion_offset, expected_offset,
-                    "Expected offset {} for item {}",
-                    expected_offset, i
+                    "Expected offset {} for function {}",
+                    expected_offset, item.fn_id
                 );
             }