update tests

weibocom · May 9, 2019 · 57bd83a · 57bd83a
1 parent c18837d
commit 57bd83a
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 2 deletions.
diff --git a/lib/motan/init.lua b/lib/motan/init.lua
@@ -45,6 +45,7 @@ local Motan = {
 
 local init_env
 init_env = function(default_env_setting)
+    local default_env_setting = default_env_setting or {}
     local app_root = default_env_setting.APP_ROOT or os.getenv("APP_ROOT") or nil
     local motan_env = default_env_setting.MOTAN_ENV or os.getenv("MOTAN_ENV") or "production"
     assert(app_root ~= nil, "APP_ROOT should not be nil")

diff --git a/t/000-sanity.t b/t/000-sanity.t
@@ -7,6 +7,7 @@ our $MOTAN_DEMO_PATH=$root_path . "/motan-demo/";
 
 $ENV{TEST_NGINX_SERVER_PORT} = 1990;
 $ENV{MOTAN_ENV} = "development";
+$ENV{APP_ROOT} = $MOTAN_DEMO_PATH;
 # $ENV{LUA_PACKAGE_PATH} ||= $MOTAN_DEMO_PATH . "/?.lua;" . $MOTAN_DEMO_PATH . "/?/init.lua;" . $MOTAN_P_ROOT . "/?.lua;" . $MOTAN_P_ROOT . "/?/init.lua;./?.lua;/?.lua;/?/init.lua";
 log_level('warn');
 #worker_connections(1014);

diff --git a/t/002-concurrent_call.t b/t/002-concurrent_call.t
@@ -9,6 +9,7 @@ our $MOTAN_DEMO_PATH=$root_path . "/motan-demo/";
 
 $ENV{TEST_NGINX_SERVER_PORT} = 1990;
 $ENV{MOTAN_ENV} = "development";
+$ENV{APP_ROOT} = $MOTAN_DEMO_PATH;
 # $ENV{LUA_PACKAGE_PATH} ||= $MOTAN_DEMO_PATH . "/?.lua;" . $MOTAN_DEMO_PATH . "/?/init.lua;" . $MOTAN_P_ROOT . "/?.lua;" . $MOTAN_P_ROOT . "/?/init.lua;./?.lua;/?.lua;/?/init.lua";
 log_level('warn');
 #worker_connections(1014);
@@ -96,7 +97,7 @@ __DATA__
             end
             local ok, res_or_err = ngx.thread.wait(threads[run_time])
             if not ok then
-                ngx.say("fail to run, err:" .. res_or_err)
+                ngx.say("fail to run, err:", res_or_err)
             else
                 local check_rs = {}
                 for k, v in pairs(res_or_err) do

diff --git a/t/003-unpack_bug.t b/t/003-unpack_bug.t
@@ -9,6 +9,7 @@ our $MOTAN_DEMO_PATH=$root_path . "/motan-demo/";
 
 $ENV{TEST_NGINX_SERVER_PORT} = 1990;
 $ENV{MOTAN_ENV} = "development";
+$ENV{APP_ROOT} = $MOTAN_DEMO_PATH;
 # $ENV{LUA_PACKAGE_PATH} ||= $MOTAN_DEMO_PATH . "/?.lua;" . $MOTAN_DEMO_PATH . "/?/init.lua;" . $MOTAN_P_ROOT . "/?.lua;" . $MOTAN_P_ROOT . "/?/init.lua;./?.lua;/?.lua;/?/init.lua";
 log_level('warn');
 #worker_connections(1014);

diff --git a/t/004-simple-serialize.t b/t/004-simple-serialize.t
@@ -18,6 +18,7 @@ _EOC_
 
 $ENV{TEST_NGINX_SERVER_PORT} = 1990;
 $ENV{MOTAN_ENV} = "development";
+$ENV{APP_ROOT} = $MOTAN_DEMO_PATH;
 log_level('warn');
 #worker_connections(1014);
 #master_on();

diff --git a/t/005-simple-deserialize.t b/t/005-simple-deserialize.t
@@ -18,6 +18,7 @@ _EOC_
 
 $ENV{TEST_NGINX_SERVER_PORT} = 1990;
 $ENV{MOTAN_ENV} = "development";
+$ENV{APP_ROOT} = $MOTAN_DEMO_PATH;
 log_level('warn');
 #worker_connections(1014);
 #master_on();

diff --git a/t/motan-demo/motan-service/HelloWorldService.lua b/t/motan-demo/motan-service/HelloWorldService.lua
@@ -20,7 +20,8 @@ function _M.Hello(self, p1, p2)
 end
 
 function _M.ConcurrentHello(self, p1, p2)
-    return self.metadata
+    ngx.log(ngx.ERR, "ConcurrentHello ===>", sprint_r({p1, p2}))
+    return motan_ctx().metadata
 end
 
 return _M