1 files changed, 31 insertions, 26 deletions
diff --git a/test/unit/multiqueue_spec.lua b/test/unit/multiqueue_spec.lua
index c7f8dd8328..bb08a8386f 100644
--- a/test/unit/multiqueue_spec.lua
+++ b/test/unit/multiqueue_spec.lua
@@ -1,9 +1,12 @@
-local helpers = require("test.unit.helpers")
+local helpers = require("test.unit.helpers")(after_each)
+local itp = helpers.gen_itp(it)
 
-local ffi     = helpers.ffi
-local eq      = helpers.eq
+local child_call_once = helpers.child_call_once
+local cimport = helpers.cimport
+local ffi = helpers.ffi
+local eq = helpers.eq
 
-local multiqueue = helpers.cimport("./test/unit/fixtures/multiqueue.h")
+local multiqueue = cimport("./test/unit/fixtures/multiqueue.h")
 
 describe("multiqueue (multi-level event-queue)", function()
   local parent, child1, child2, child3
@@ -21,28 +24,30 @@ describe("multiqueue (multi-level event-queue)", function()
   end
 
   before_each(function()
-    parent = multiqueue.multiqueue_new_parent(ffi.NULL, ffi.NULL)
-    child1 = multiqueue.multiqueue_new_child(parent)
-    child2 = multiqueue.multiqueue_new_child(parent)
-    child3 = multiqueue.multiqueue_new_child(parent)
-    put(child1, 'c1i1')
-    put(child1, 'c1i2')
-    put(child2, 'c2i1')
-    put(child1, 'c1i3')
-    put(child2, 'c2i2')
-    put(child2, 'c2i3')
-    put(child2, 'c2i4')
-    put(child3, 'c3i1')
-    put(child3, 'c3i2')
+    child_call_once(function()
+      parent = multiqueue.multiqueue_new_parent(ffi.NULL, ffi.NULL)
+      child1 = multiqueue.multiqueue_new_child(parent)
+      child2 = multiqueue.multiqueue_new_child(parent)
+      child3 = multiqueue.multiqueue_new_child(parent)
+      put(child1, 'c1i1')
+      put(child1, 'c1i2')
+      put(child2, 'c2i1')
+      put(child1, 'c1i3')
+      put(child2, 'c2i2')
+      put(child2, 'c2i3')
+      put(child2, 'c2i4')
+      put(child3, 'c3i1')
+      put(child3, 'c3i2')
+    end)
   end)
 
-  it('keeps count of added events', function()
+  itp('keeps count of added events', function()
     eq(3, multiqueue.multiqueue_size(child1))
     eq(4, multiqueue.multiqueue_size(child2))
     eq(2, multiqueue.multiqueue_size(child3))
   end)
 
-  it('keeps count of removed events', function()
+  itp('keeps count of removed events', function()
     multiqueue.multiqueue_get(child1)
     eq(2, multiqueue.multiqueue_size(child1))
     multiqueue.multiqueue_get(child1)
@@ -57,7 +62,7 @@ describe("multiqueue (multi-level event-queue)", function()
     eq(0, multiqueue.multiqueue_size(child1))
   end)
 
-  it('removing from parent removes from child', function()
+  itp('removing from parent removes from child', function()
     eq('c1i1', get(parent))
     eq('c1i2', get(parent))
     eq('c2i1', get(parent))
@@ -67,7 +72,7 @@ describe("multiqueue (multi-level event-queue)", function()
     eq('c2i4', get(parent))
   end)
 
-  it('removing from child removes from parent', function()
+  itp('removing from child removes from parent', function()
     eq('c2i1', get(child2))
     eq('c2i2', get(child2))
     eq('c1i1', get(child1))
@@ -77,13 +82,13 @@ describe("multiqueue (multi-level event-queue)", function()
     eq('c2i4', get(parent))
   end)
 
-  it('removing from child at the beginning of parent', function()
+  itp('removing from child at the beginning of parent', function()
     eq('c1i1', get(child1))
     eq('c1i2', get(child1))
     eq('c2i1', get(parent))
   end)
 
-  it('removing from parent after get from parent and put to child', function()
+  itp('removing from parent after get from parent and put to child', function()
     eq('c1i1', get(parent))
     eq('c1i2', get(parent))
     eq('c2i1', get(parent))
@@ -99,7 +104,7 @@ describe("multiqueue (multi-level event-queue)", function()
     eq('c1i22', get(parent))
   end)
 
-  it('removing from parent after get and put to child', function()
+  itp('removing from parent after get and put to child', function()
     eq('c1i1', get(child1))
     eq('c1i2', get(child1))
     eq('c2i1', get(child2))
@@ -117,7 +122,7 @@ describe("multiqueue (multi-level event-queue)", function()
     eq('c1i12', get(parent))
   end)
 
-  it('put after removing from child at the end of parent', function()
+  itp('put after removing from child at the end of parent', function()
     eq('c3i1', get(child3))
     eq('c3i2', get(child3))
     put(child1, 'c1i11')
@@ -133,7 +138,7 @@ describe("multiqueue (multi-level event-queue)", function()
     eq('c2i11', get(parent))
   end)
 
-  it('removes from parent queue when child is freed', function()
+  itp('removes from parent queue when child is freed', function()
     free(child2)
     eq('c1i1', get(parent))
     eq('c1i2', get(parent))