Merge pull request #258 from Shopify/cbruckmayer/fix-static-queue-expiry

Fix expiry of static queue
Shopify · Feb 6, 2024 · 5bc8813 · 5bc8813
2 parents c356cdb + 8335365
commit 5bc8813
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/ruby/lib/ci/queue/static.rb b/ruby/lib/ci/queue/static.rb
@@ -63,7 +63,7 @@ def created_at=(timestamp)
       end
 
       def expired?
-        (@created_at.to_f TEN_MINUTES) < CI::Queue.time_now.to_f
+        (@created_at.to_f + TEN_MINUTES) < CI::Queue.time_now.to_f
       end
 
       def populated?

diff --git a/ruby/test/ci/queue/static_test.rb b/ruby/test/ci/queue/static_test.rb
@@ -4,6 +4,14 @@
 class CI::Queue::StaticTest < Minitest::Test
   include SharedQueueAssertions
 
+  def test_expired
+    queue = CI::Queue.from_uri('list:foo:bar:plop%3Ffizz', config)
+    assert queue.expired?
+
+    queue.created_at = Time.now
+    refute queue.expired?
+  end
+
   private
 
   def build_queue