Skip to content

Commit

Permalink
Revert "tests: added the fake-merge-module and new test case covering…
Browse files Browse the repository at this point in the history
… 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
  • Loading branch information
thibaultcha committed Jan 27, 2020
1 parent a0f73b3 commit b973eb2
Show file tree
Hide file tree
Showing 4 changed files with 0 additions and 208 deletions.
18 changes: 0 additions & 18 deletions t/124-init-worker.t
Expand Up @@ -699,21 +699,3 @@ This also affects merge_loc_conf
ok
--- no_error_log
[error]



=== TEST 20: ensure it does not mutate another module's main_conf (github issue #1553)
https://github.com/openresty/lua-nginx-module/issues/1553
--- stream_config
init_worker_by_lua_block {
return
}
--- stream_server_config
content_by_lua_block {
ngx.say("fake_var = ", ngx.var.fake_var)
}
--- stream_response
fake_var = 1
--- no_error_log
[error]
[alert]
3 changes: 0 additions & 3 deletions t/data/fake-merge-module/config

This file was deleted.

184 changes: 0 additions & 184 deletions t/data/fake-merge-module/ngx_stream_fake_merge_module.c

This file was deleted.

3 changes: 0 additions & 3 deletions util/build.sh
Expand Up @@ -10,8 +10,6 @@ version=$1
force=$2
home=~

add_fake_merge_module="--add-module=$root/t/data/fake-merge-module"

#--add-module=$root/../stream-echo-nginx-module \
ngx-build $force $version \
--with-cc-opt="-DNGX_LUA_USE_ASSERT -I$PCRE_INC -I$OPENSSL_INC" \
Expand All @@ -35,7 +33,6 @@ ngx-build $force $version \
--add-module=$root/../echo-nginx-module \
--add-module=$root/../memc-nginx-module \
--add-module=$root/../headers-more-nginx-module \
$add_fake_merge_module \
--add-module=$root $opts \
--with-poll_module \
--without-http_ssi_module \
Expand Down

0 comments on commit b973eb2

Please sign in to comment.