clean up on module test success, fix priming query failing predict test

diff --git a/modules/predict/predict_test.lua b/modules/predict/predict_test.lua
index fe8a8192cbc533af9db6ab1d0fdb5535127c5f17..e4694b635a6f76e6c0d2c9a50ffc1099bbbf5799 100644 (file)
--- a/modules/predict/predict_test.lua
+++ b/modules/predict/predict_test.lua
@@ -22,6 +22,7 @@ end
 
 -- test if draining of prefetch queue works
 local function test_predict_drain()
+       resolve_count = 0
        predict.queue_len = 2
        predict.queue['TYPE65535 example.com'] = 1
        predict.queue['SOA example.com'] = 1

diff --git a/tests/config/test.cfg b/tests/config/test.cfg
index c569dd85a1f69e212632be6573c02db8b89942c1..0719193e8d15cbadf57fd99deb97bdb897f5f023 100644 (file)
--- a/tests/config/test.cfg
+++ b/tests/config/test.cfg
@@ -12,6 +12,16 @@ if ok then
        jit.off()
 end
 
+-- override os.exit to allow cleanup on exit
+local exit = os.exit
+os.exit = function (code)
+       if code == 0 then
+               quit()
+       else
+               exit(code) -- This will leak memory
+       end
+end
+
 -- export testing module in globals
 local tapered = require('tapered.src.tapered')
 for k, v in pairs(tapered) do