FIXUP: Release all taken tasks on start

Squash duplicated tests.

Author: Totktonada

t/010-fifo.t

@@ -10,6 +10,7 @@ local state = require('queue.abstract.state')
 
 local engine = os.getenv('ENGINE') or 'memtx'
 
+local common = require('t.common')
 local tnt = require('t.tnt')
 tnt.cfg{}
 
@@ -292,35 +293,7 @@ test:test('if_not_exists test', function(test)
     test:isnt(tube, tube_new, "if_not_exists if tube doesn't exists")
 end)
 
-test:test('Get tasks by state test', function(test)
-    test:plan(2)
-    local tube = queue.create_tube('test_task_it', 'fifo')
-
-    for i = 1, 10 do
-        tube:put('test_data' .. tostring(i))
-    end
-    for i = 1, 4 do
-        tube:take(0.001)
-    end
-
-    local count_taken = 0
-    local count_ready = 0
-
-    for _, task in tube.raw:tasks_by_state(state.READY) do
-        if task[2] == state.READY then
-            count_ready = count_ready + 1
-        end
-    end
-
-    for _, task in tube.raw:tasks_by_state(state.TAKEN) do
-        if task[2] == state.TAKEN then
-            count_taken = count_taken + 1
-        end
-    end
-
-    test:is(count_ready, 6, 'Check tasks count in a ready state')
-    test:is(count_taken, 4, 'Check tasks count in a taken state')
-end)
+test:test('get tasks by state', common.test_task_by_state, 'fifo')
 
 tnt.finish()
 os.exit(test:check() and 0 or 1)

t/020-fifottl.t

@@ -9,6 +9,7 @@ local state = require('queue.abstract.state')
 
 local qc = require('queue.compat')
 
+local common = require('t.common')
 local tnt  = require('t.tnt')
 tnt.cfg{}
 
@@ -262,35 +263,7 @@ test:test('buried task in a dropped queue', function(test)
     test:ok(true, 'queue does not hang')
 end)
 
-test:test('Get tasks by state test', function(test)
-    test:plan(2)
-    local tube = queue.create_tube('test_task_it', 'fifottl')
-
-    for i = 1, 10 do
-        tube:put('test_data' .. tostring(i))
-    end
-    for i = 1, 4 do
-        tube:take(0.001)
-    end
-
-    local count_taken = 0
-    local count_ready = 0
-
-    for _, task in tube.raw:tasks_by_state(state.READY) do
-        if task[2] == state.READY then
-            count_ready = count_ready + 1
-        end
-    end
-
-    for _, task in tube.raw:tasks_by_state(state.TAKEN) do
-        if task[2] == state.TAKEN then
-            count_taken = count_taken + 1
-        end
-    end
-
-    test:is(count_ready, 6, 'Check tasks count in a ready state')
-    test:is(count_taken, 4, 'Check tasks count in a taken state')
-end)
+test:test('get tasks by state', common.test_task_by_state, 'fifottl')
 
 tnt.finish()
 os.exit(test:check() and 0 or 1)

t/030-utube.t

@@ -8,6 +8,7 @@ test:plan(12)
 local queue = require('queue')
 local state = require('queue.abstract.state')
 
+local common = require('t.common')
 local tnt  = require('t.tnt')
 tnt.cfg{}
 
@@ -156,35 +157,7 @@ test:test('if_not_exists test', function(test)
     test:isnt(tube, tube_new, "if_not_exists if tube doesn't exists")
 end)
 
-test:test('Get tasks by state test', function(test)
-    test:plan(2)
-    local tube = queue.create_tube('test_task_it', 'utube')
-
-    for i = 1, 10 do
-        tube:put('test_data' .. tostring(i), { utube = i })
-    end
-    for i = 1, 4 do
-        tube:take(0.001)
-    end
-
-    local count_taken = 0
-    local count_ready = 0
-
-    for _, task in tube.raw:tasks_by_state(state.READY) do
-        if task[2] == state.READY then
-            count_ready = count_ready + 1
-        end
-    end
-
-    for _, task in tube.raw:tasks_by_state(state.TAKEN) do
-        if task[2] == state.TAKEN then
-            count_taken = count_taken + 1
-        end
-    end
-
-    test:is(count_ready, 6, 'Check tasks count in a ready state')
-    test:is(count_taken, 4, 'Check tasks count in a taken state')
-end)
+test:test('get tasks by state', common.test_task_by_state, 'utube')
 
 tnt.finish()
 os.exit(test:check() and 0 or 1)

t/040-utubettl.t

@@ -10,6 +10,7 @@ local state = require('queue.abstract.state')
 
 local qc = require('queue.compat')
 
+local common = require('t.common')
 local tnt  = require('t.tnt')
 tnt.cfg{}
 
@@ -257,35 +258,7 @@ test:test('ttl after delay test', function(test)
     test:is(task.ttr, TTR * 1000000, 'check TTR after release')
 end)
 
-test:test('Get tasks by state test', function(test)
-    test:plan(2)
-    local tube = queue.create_tube('test_task_it', 'utubettl')
-
-    for i = 1, 10 do
-        tube:put('test_data' .. tostring(i), { utube = i })
-    end
-    for i = 1, 4 do
-        tube:take(0.001)
-    end
-
-    local count_taken = 0
-    local count_ready = 0
-
-    for _, task in tube.raw:tasks_by_state(state.READY) do
-        if task[2] == state.READY then
-            count_ready = count_ready + 1
-        end
-    end
-
-    for _, task in tube.raw:tasks_by_state(state.TAKEN) do
-        if task[2] == state.TAKEN then
-            count_taken = count_taken + 1
-        end
-    end
-
-    test:is(count_ready, 6, 'Check tasks count in a ready state')
-    test:is(count_taken, 4, 'Check tasks count in a taken state')
-end)
+test:test('get tasks by state', common.test_task_by_state, 'utubettl')
 
 tnt.finish()
 os.exit(test:check() and 0 or 1)

t/100-limfifottl.t

@@ -7,13 +7,14 @@ local state = require('queue.abstract.state')
 
 local engine = os.getenv('ENGINE') or 'memtx'
 
+local common = require('t.common')
 local tnt = require('t.tnt')
 tnt.cfg{}
 
 local test = require('tap').test()
 
 if engine == 'memtx' then
-    test:plan(9)
+    test:plan(10)
 
     test:ok(rawget(box, 'space'), 'box started')
     test:ok(queue, 'queue is loaded')
@@ -61,6 +62,8 @@ if engine == 'memtx' then
         test:ok(unlim_tube:put{1}, 'task 1 was put')
         test:ok(unlim_tube:put{2}, 'task 2 was put')
     end)
+
+    test:test('Get tasks by state', common.test_task_by_state, 'limfifottl')
 else
     test:plan(1)
     local ok = pcall(queue.create_tube, 'unsupported_engine', 'limfifottl', { engine = engine })

t/common.lua

@@ -0,0 +1,49 @@
+--
+-- Common code to reuse for testing different drivers.
+--
+
+local queue = require('queue')
+local state = require('queue.abstract.state')
+
+local common = {}
+
+--
+-- Usage:
+--
+-- test:test('get tasks by state', common.test_task_by_state, 'fifo')
+--
+function common.test_task_by_state(test, driver)
+    test:plan(2)
+    local tube = queue.create_tube('test_task_it', driver)
+
+    for i = 1, 10 do
+        local put_opts
+        if driver == 'utube' or driver == 'utubettl' then
+            put_opts = {utube = i}
+        end
+        tube:put('test_data' .. tostring(i), put_opts)
+    end
+    for i = 1, 4 do
+        tube:take(0.001)
+    end
+
+    local count_ready = 0
+    local count_taken = 0
+
+    for _, task in tube.raw:tasks_by_state(state.READY) do
+        if task[2] == state.READY then
+            count_ready = count_ready + 1
+        end
+    end
+
+    for _, task in tube.raw:tasks_by_state(state.TAKEN) do
+        if task[2] == state.TAKEN then
+            count_taken = count_taken + 1
+        end
+    end
+
+    test:is(count_ready, 6, 'check tasks count in a ready state')
+    test:is(count_taken, 4, 'check tasks count in a taken state')
+end
+
+return common