Skip to content

Commit b973eb2

Browse files
committed
Revert "tests: added the fake-merge-module and new test case covering the init_worker_by_lua* mutating another module's main_conf bug."
This reverts commit 3fdc418. A follow-up to reverting a0f73b3 which contained the code for this test case which now fails since reverted. See details for the revert at: openresty/lua-nginx-module#1627
1 parent a0f73b3 commit b973eb2

File tree

4 files changed

+0
-208
lines changed

4 files changed

+0
-208
lines changed

t/124-init-worker.t

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -699,21 +699,3 @@ This also affects merge_loc_conf
699699
ok
700700
--- no_error_log
701701
[error]
702-
703-
704-
705-
=== TEST 20: ensure it does not mutate another module's main_conf (github issue #1553)
706-
https://github.com/openresty/lua-nginx-module/issues/1553
707-
--- stream_config
708-
init_worker_by_lua_block {
709-
return
710-
}
711-
--- stream_server_config
712-
content_by_lua_block {
713-
ngx.say("fake_var = ", ngx.var.fake_var)
714-
}
715-
--- stream_response
716-
fake_var = 1
717-
--- no_error_log
718-
[error]
719-
[alert]

t/data/fake-merge-module/config

Lines changed: 0 additions & 3 deletions
This file was deleted.

t/data/fake-merge-module/ngx_stream_fake_merge_module.c

Lines changed: 0 additions & 184 deletions
This file was deleted.

util/build.sh

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,6 @@ version=$1
1010
force=$2
1111
home=~
1212

13-
add_fake_merge_module="--add-module=$root/t/data/fake-merge-module"
14-
1513
#--add-module=$root/../stream-echo-nginx-module \
1614
ngx-build $force $version \
1715
--with-cc-opt="-DNGX_LUA_USE_ASSERT -I$PCRE_INC -I$OPENSSL_INC" \
@@ -35,7 +33,6 @@ ngx-build $force $version \
3533
--add-module=$root/../echo-nginx-module \
3634
--add-module=$root/../memc-nginx-module \
3735
--add-module=$root/../headers-more-nginx-module \
38-
$add_fake_merge_module \
3936
--add-module=$root $opts \
4037
--with-poll_module \
4138
--without-http_ssi_module \

0 commit comments

Comments
 (0)