tests: stream/os-getenv.t: updated suite to support ngx_stream_lua module without old CFunction APIs.

Author: thibaultcha

t/stream/os-getenv.t

@@ -2,7 +2,7 @@
 use lib '.';
 use t::TestCore::Stream;
 
-plan tests => repeat_each() * (blocks() * 2 + 2);
+plan tests => repeat_each() * (blocks() * 2 + 1);
 
 $ENV{TEST_NGINX_BAR} = 'world';
 $ENV{TEST_NGINX_LUA_PACKAGE_PATH} = "$t::TestCore::Stream::lua_package_path";
@@ -154,81 +154,38 @@ in content:\s+
 
 
 === TEST 8: os.getenv() overwrite is reverted in worker phases
---- stream_config
-    lua_package_path "$TEST_NGINX_LUA_PACKAGE_PATH";
-    lua_load_resty_core off;
-
-    init_by_lua_block {
-        package.loaded.os_getenv = os.getenv
-        require "resty.core"
-        package.loaded.is_os_getenv = os.getenv == package.loaded.os_getenv
-    }
---- stream_server_config
-    content_by_lua_block {
-        os.getenv("")
-
-        ngx.say("in init: ", package.loaded.is_os_getenv, "\n",
-                "in content: ", os.getenv == package.loaded.os_getenv)
-    }
---- stream_response
-in init: false
-in content: true
-
-
-
-=== TEST 9: os.getenv() can be localized before loading resty.core
 --- main_config
 env FOO=hello;
 --- stream_config
     lua_package_path "$TEST_NGINX_LUA_PACKAGE_PATH";
-    lua_load_resty_core off;
 
     init_by_lua_block {
-        package.loaded.os_getenv = os.getenv
-        require "resty.core"
-
-        do
-            local getenv = os.getenv
-
-            package.loaded.f = function ()
-                ngx.log(ngx.NOTICE, "FOO: ", getenv("FOO"))
-            end
-        end
-
-        package.loaded.f()
-
-        package.loaded.is_os_getenv = os.getenv == package.loaded.os_getenv
+        package.loaded.init_os_getenv = os.getenv
     }
 --- stream_server_config
     content_by_lua_block {
-        package.loaded.f()
-        package.loaded.f()
+        ngx.say("FOO=", os.getenv("FOO"))
 
-        ngx.say("in init: ", package.loaded.is_os_getenv, "\n",
-                "in content: ", os.getenv == package.loaded.os_getenv)
+        if os.getenv ~= package.loaded.init_os_getenv then
+            ngx.say("os.getenv() overwrite was reverted")
+
+        else
+            ngx.say("os.getenv() overwrite was not reverted")
+        end
     }
 --- stream_response
-in init: false
-in content: true
---- grep_error_log eval
-qr/FOO: [a-z]+/
---- grep_error_log_out
-FOO: hello
-FOO: hello
-FOO: hello
+FOO=hello
+os.getenv() overwrite was reverted
 
 
 
-=== TEST 10: os.getenv() can be localized after loading resty.core
+=== TEST 9: os.getenv() can be localized after loading resty.core
 --- main_config
 env FOO=hello;
 --- stream_config
     lua_package_path "$TEST_NGINX_LUA_PACKAGE_PATH";
-    lua_load_resty_core off;
 
     init_by_lua_block {
-        package.loaded.os_getenv = os.getenv
-
         do
             local getenv = os.getenv
 
@@ -248,15 +205,18 @@ env FOO=hello;
         package.loaded.f()
         package.loaded.f()
 
-        ngx.say("in init: ", package.loaded.is_os_getenv, "\n",
-                "in content: ", os.getenv == package.loaded.os_getenv)
+        if os.getenv ~= package.loaded.init_os_getenv then
+            ngx.say("os.getenv() overwrite was reverted")
+
+        else
+            ngx.say("os.getenv() overwrite was not reverted")
+        end
     }
 --- stream_response
-in init: false
-in content: false
+os.getenv() overwrite was reverted
 --- grep_error_log eval
 qr/FOO: [a-z]+/
 --- grep_error_log_out
-FOO: nil
+FOO: hello
 FOO: hello
 FOO: hello