From 2b87485c22e2e42eba54d57454b33dca02f9d67c Mon Sep 17 00:00:00 2001
From: "Justin M. Keyes" <justinkz@gmail.com>
Date: Thu, 29 Nov 2018 23:26:21 +0100
Subject: test: Extend {unit,functional}.helpers with global helpers

Automatically include all "global helper" util functions in the
unit.helpers and functional.helpers and modules.  So tests don't need to
expicitly do:

    local global_helpers = require('test.helpers')
---
 test/unit/helpers.lua | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

(limited to 'test/unit')

diff --git a/test/unit/helpers.lua b/test/unit/helpers.lua
index beb25f25db..c42eddf7f3 100644
--- a/test/unit/helpers.lua
+++ b/test/unit/helpers.lua
@@ -15,7 +15,6 @@ local dedent = global_helpers.dedent
 local neq = global_helpers.neq
 local map = global_helpers.map
 local eq = global_helpers.eq
-local ok = global_helpers.ok
 
 -- C constants.
 local NULL = ffi.cast('void*', 0)
@@ -842,9 +841,6 @@ local module = {
   cimport = cimport,
   cppimport = cppimport,
   internalize = internalize,
-  ok = ok,
-  eq = eq,
-  neq = neq,
   ffi = ffi,
   lib = lib,
   cstr = cstr,
@@ -869,6 +865,7 @@ local module = {
   ptr2key = ptr2key,
   debug_log = debug_log,
 }
+module = global_helpers.map_extend('error', module, global_helpers)
 return function()
   return module
 end
-- 
cgit