Skip to content

Commit 2c0f301

Browse files
authored
Fixes errors when running tests without coverage reporting (#190)
* Use $LedgeEnv::test_coverage instead of old $ENV * Wait a little longer for purge
1 parent 32f3553 commit 2c0f301

File tree

5 files changed

+9
-9
lines changed

5 files changed

+9
-9
lines changed

Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ check_ports:
152152
###############################################################################
153153

154154
releng:
155-
@util/lua-releng -eLs
155+
@util/lua-releng -eL
156156

157157
flush_db:
158158
@$(REDIS_CLI) flushall

t/01-unit/events.t

+1-1
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ qq {
9999
lua_package_path "./lib/?.lua;../lua-resty-redis-connector/lib/?.lua;../lua-resty-qless/lib/?.lua;../lua-resty-http/lib/?.lua;../lua-ffi-zlib/lib/?.lua;;";
100100
101101
init_by_lua_block {
102-
if $ENV{TEST_COVERAGE} == 1 then
102+
if $LedgeEnv::test_coverage == 1 then
103103
require("luacov.runner").init()
104104
end
105105

t/01-unit/ledge.t

+4-4
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ GET /ledge_2
5050
qq {
5151
lua_package_path "./lib/?.lua;../lua-resty-redis-connector/lib/?.lua;../lua-resty-qless/lib/?.lua;;";
5252
init_by_lua_block {
53-
if $ENV{TEST_COVERAGE} == 1 then
53+
if $LedgeEnv::test_coverage == 1 then
5454
require("luacov.runner").init()
5555
end
5656
local ok, err = pcall(require("ledge").configure, { foo = "bar" })
@@ -114,7 +114,7 @@ qq{
114114
lua_package_path "./lib/?.lua;../lua-resty-redis-connector/lib/?.lua;../lua-resty-qless/lib/?.lua;;";
115115
116116
init_by_lua_block {
117-
if $ENV{TEST_COVERAGE} == 1 then
117+
if $LedgeEnv::test_coverage == 1 then
118118
require("luacov.runner").init()
119119
end
120120
require("ledge").configure({
@@ -164,7 +164,7 @@ qq{
164164
lua_package_path "./lib/?.lua;../lua-resty-redis-connector/lib/?.lua;../lua-resty-qless/lib/?.lua;;";
165165
166166
init_by_lua_block {
167-
if $ENV{TEST_COVERAGE} == 1 then
167+
if $LedgeEnv::test_coverage == 1 then
168168
require("luacov.runner").init()
169169
end
170170
require("ledge").set_handler_defaults({
@@ -224,7 +224,7 @@ qq{
224224
lua_package_path "./lib/?.lua;../lua-resty-redis-connector/lib/?.lua;../lua-resty-qless/lib/?.lua;;";
225225
226226
init_by_lua_block {
227-
if $ENV{TEST_COVERAGE} == 1 then
227+
if $LedgeEnv::test_coverage == 1 then
228228
require("luacov.runner").init()
229229
end
230230
require("ledge").configure({

t/01-unit/worker.t

+2-2
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ GET /worker_2
4949
qq {
5050
lua_package_path "./lib/?.lua;;";
5151
init_by_lua_block {
52-
if $ENV{TEST_COVERAGE} == 1 then
52+
if $LedgeEnv::test_coverage == 1 then
5353
require("luacov.runner").init()
5454
end
5555
}
@@ -74,7 +74,7 @@ field foo does not exist
7474
qq {
7575
lua_package_path "./lib/?.lua;;";
7676
init_by_lua_block {
77-
if $ENV{TEST_COVERAGE} == 1 then
77+
if $LedgeEnv::test_coverage == 1 then
7878
require("luacov.runner").init()
7979
end
8080
}

t/02-integration/purge.t

+1-1
Original file line numberDiff line numberDiff line change
@@ -401,7 +401,7 @@ location /purge_cached_8 {
401401
}
402402
--- request
403403
PURGE /purge_cached_8*
404-
--- wait: 1
404+
--- wait: 2
405405
--- no_error_log
406406
[error]
407407
--- response_body_like

0 commit comments

Comments
 (0)