tests: hardened JIT-ability of the test suite and broadened support for the TEST_NGINX_HOTLOOP environment variable.

This also harden various test cases and removes a few globals caught by
the _G write guard.

Author: thibaultcha

t/TestCore.pm

@@ -0,0 +1,50 @@
+package t::TestCore;
+
+use Test::Nginx::Socket::Lua -Base;
+use Cwd qw(cwd);
+
+$ENV{TEST_NGINX_HOTLOOP} ||= 10;
+
+our $pwd = cwd();
+
+our $lua_package_path = './lib/?.lua;../lua-resty-lrucache/lib/?.lua;;';
+
+our $init_by_lua_block = <<_EOC_;
+    local verbose = false
+    if verbose then
+        local dump = require "jit.dump"
+        dump.on("b", "$Test::Nginx::Util::ErrLogFile")
+    else
+        local v = require "jit.v"
+        v.on("$Test::Nginx::Util::ErrLogFile")
+    end
+
+    require "resty.core"
+    jit.opt.start("hotloop=$ENV{TEST_NGINX_HOTLOOP}")
+    -- jit.off()
+_EOC_
+
+our $HttpConfig = <<_EOC_;
+    lua_package_path '$lua_package_path';
+
+    init_by_lua_block {
+        $t::TestCore::init_by_lua_block
+    }
+_EOC_
+
+our @EXPORT = qw(
+    $pwd
+    $lua_package_path
+    $init_by_lua_block
+    $HttpConfig
+);
+
+add_block_preprocessor(sub {
+    my $block = shift;
+
+    if (!defined $block->http_config) {
+        $block->set_value("http_config", $HttpConfig);
+    }
+});
+
+1;

t/TestCore/Stream.pm

@@ -0,0 +1,50 @@
+package t::TestCore::Stream;
+
+use Test::Nginx::Socket::Lua::Stream -Base;
+use Cwd qw(cwd);
+
+$ENV{TEST_NGINX_HOTLOOP} ||= 10;
+
+our $pwd = cwd();
+
+our $lua_package_path = './lib/?.lua;../lua-resty-lrucache/lib/?.lua;;';
+
+our $init_by_lua_block = <<_EOC_;
+    local verbose = false
+    if verbose then
+        local dump = require "jit.dump"
+        dump.on("b", "$Test::Nginx::Util::ErrLogFile")
+    else
+        local v = require "jit.v"
+        v.on("$Test::Nginx::Util::ErrLogFile")
+    end
+
+    require "resty.core"
+    jit.opt.start("hotloop=$ENV{TEST_NGINX_HOTLOOP}")
+    -- jit.off()
+_EOC_
+
+our $StreamConfig = <<_EOC_;
+    lua_package_path '$lua_package_path';
+
+    init_by_lua_block {
+        $t::TestCore::Stream::init_by_lua_block
+    }
+_EOC_
+
+our @EXPORT = qw(
+    $pwd
+    $lua_package_path
+    $init_by_lua_block
+    $StreamConfig
+);
+
+add_block_preprocessor(sub {
+    my $block = shift;
+
+    if (!defined $block->stream_config) {
+        $block->set_value("stream_config", $StreamConfig);
+    }
+});
+
+1;

t/balancer-timeout.t

@@ -20,8 +20,8 @@ BEGIN {
     $ENV{TEST_NGINX_POSTPONE_OUTPUT} = 1;
 }
 
-use Test::Nginx::Socket::Lua;
-use Cwd qw(cwd);
+use lib '.';
+use t::TestCore;
 
 #worker_connections(1014);
 #master_on();
@@ -32,7 +32,7 @@ repeat_each(2);
 
 plan tests => repeat_each() * (blocks() * 4);
 
-$ENV{TEST_NGINX_CWD} = cwd();
+$ENV{TEST_NGINX_LUA_PACKAGE_PATH} = $t::TestCore::lua_package_path;
 
 #worker_connections(1024);
 #no_diff();
@@ -43,7 +43,7 @@ __DATA__
 
 === TEST 1: set_timeouts
 --- http_config
-    lua_package_path "$TEST_NGINX_CWD/lib/?.lua;;";
+    lua_package_path "$TEST_NGINX_LUA_PACKAGE_PATH";
 
     upstream backend {
         server 0.0.0.1;
@@ -77,7 +77,7 @@ event timer add: \d+: 7689:
 
 === TEST 2: set_timeouts (nil connect timeout)
 --- http_config
-    lua_package_path "$TEST_NGINX_CWD/lib/?.lua;;";
+    lua_package_path "$TEST_NGINX_LUA_PACKAGE_PATH";
     proxy_connect_timeout 1234ms;
 
     upstream backend {
@@ -112,7 +112,7 @@ event timer add: \d+: 7689:
 
 === TEST 3: set_timeouts (nil send timeout)
 --- http_config
-    lua_package_path "$TEST_NGINX_CWD/lib/?.lua;;";
+    lua_package_path "$TEST_NGINX_LUA_PACKAGE_PATH";
     proxy_send_timeout 5678ms;
 
     upstream backend {
@@ -147,7 +147,7 @@ event timer add: \d+: 7689:
 
 === TEST 4: set_timeouts (nil read timeout)
 --- http_config
-    lua_package_path "$TEST_NGINX_CWD/lib/?.lua;;";
+    lua_package_path "$TEST_NGINX_LUA_PACKAGE_PATH";
     proxy_read_timeout 7689ms;
 
     upstream backend {
@@ -182,7 +182,7 @@ event timer add: \d+: 7689:
 
 === TEST 5: set connect timeout to 0
 --- http_config
-    lua_package_path "$TEST_NGINX_CWD/lib/?.lua;;";
+    lua_package_path "$TEST_NGINX_LUA_PACKAGE_PATH";
 
     upstream backend {
         server 0.0.0.1;
@@ -213,7 +213,7 @@ qr/\[error\] .*? balancer_by_lua:4: bad connect timeout/
 
 === TEST 6: set connect timeout to -1
 --- http_config
-    lua_package_path "$TEST_NGINX_CWD/lib/?.lua;;";
+    lua_package_path "$TEST_NGINX_LUA_PACKAGE_PATH";
 
     upstream backend {
         server 0.0.0.1;
@@ -244,7 +244,7 @@ qr/\[error\] .*? balancer_by_lua:4: bad connect timeout/
 
 === TEST 7: set send timeout to 0
 --- http_config
-    lua_package_path "$TEST_NGINX_CWD/lib/?.lua;;";
+    lua_package_path "$TEST_NGINX_LUA_PACKAGE_PATH";
 
     upstream backend {
         server 0.0.0.1;
@@ -275,7 +275,7 @@ qr/\[error\] .*? balancer_by_lua:4: bad send timeout/
 
 === TEST 8: set send timeout to -1
 --- http_config
-    lua_package_path "$TEST_NGINX_CWD/lib/?.lua;;";
+    lua_package_path "$TEST_NGINX_LUA_PACKAGE_PATH";
 
     upstream backend {
         server 0.0.0.1;
@@ -306,7 +306,7 @@ qr/\[error\] .*? balancer_by_lua:4: bad send timeout/
 
 === TEST 9: set read timeout to -1
 --- http_config
-    lua_package_path "$TEST_NGINX_CWD/lib/?.lua;;";
+    lua_package_path "$TEST_NGINX_LUA_PACKAGE_PATH";
 
     upstream backend {
         server 0.0.0.1;
@@ -337,7 +337,7 @@ qr/\[error\] .*? balancer_by_lua:4: bad read timeout/
 
 === TEST 10: set_timeouts called in a wrong context
 --- http_config
-    lua_package_path "$TEST_NGINX_CWD/lib/?.lua;;";
+    lua_package_path "$TEST_NGINX_LUA_PACKAGE_PATH";
 
 --- config
 
@@ -365,7 +365,7 @@ failed to call: no upstream found
 
 === TEST 11: set_timeouts called with a non-numerical parameter
 --- http_config
-    lua_package_path "$TEST_NGINX_CWD/lib/?.lua;;";
+    lua_package_path "$TEST_NGINX_LUA_PACKAGE_PATH";
 
     upstream backend {
         server 0.0.0.1;