tests: fixed test failure.

Author: zhuizhuhaomeng

.travis.yml

@@ -45,7 +45,7 @@ env:
  - TEST_NGINX_RANDOMIZE=1
  - LUACHECK_VER=0.21.1
  matrix:
- - NGINX_VERSION=1.21.4 OPENSSL_VER=1.1.1s OPENSSL_PATCH_VER=1.1.1f
+ - NGINX_VERSION=1.21.4 OPENSSL_VER=1.1.1u OPENSSL_PATCH_VER=1.1.1f
 
 services:
  - memcache

t/ctx.t

@@ -608,8 +608,10 @@ GET /t
 --- grep_error_log eval
 qr/(received: \w+|lua release ngx.ctx at ref \d+)/
 --- grep_error_log_out eval
-["",
-"lua release ngx.ctx at ref 2
+["lua release ngx.ctx at ref 1
+",
+"lua release ngx.ctx at ref 1
+lua release ngx.ctx at ref 2
 received: 42
 received: 1
 lua release ngx.ctx at ref 2
@@ -674,8 +676,10 @@ closed
 --- grep_error_log eval
 qr/lua release ngx.ctx at ref \d+/
 --- grep_error_log_out eval
-["",
+["lua release ngx.ctx at ref 1
+",
 "lua release ngx.ctx at ref 1
+lua release ngx.ctx at ref 1
 "]
 --- no_error_log
 [error]
@@ -772,15 +776,15 @@ GET /t
 qr/(received: \w+|lua release ngx.ctx at ref \d+)/
 --- grep_error_log_out eval
 ["lua release ngx.ctx at ref 2
-received: 102
+received: 112
 lua release ngx.ctx at ref 2
-received: 102
+received: 112
 lua release ngx.ctx at ref 1
 ",
 "lua release ngx.ctx at ref 2
-received: 102
+received: 112
 lua release ngx.ctx at ref 2
-received: 102
+received: 112
 lua release ngx.ctx at ref 1
 lua release ngx.ctx at ref 2
 received: 112

t/ssl-session-fetch.t

@@ -97,7 +97,7 @@ qr/ssl_session_fetch_by_lua\(nginx.conf:\d+\):\d+: session id: [a-fA-f\d]+/s
 
 --- grep_error_log_out eval
 [
-'',
+qr/ssl_session_fetch_by_lua\(nginx.conf:\d+\):4: session id: [a-fA-f\d]+/s,
 qr/ssl_session_fetch_by_lua\(nginx.conf:\d+\):4: session id: [a-fA-f\d]+/s,
 qr/ssl_session_fetch_by_lua\(nginx.conf:\d+\):4: session id: [a-fA-f\d]+/s,
 ]
@@ -184,7 +184,8 @@ qr/ssl_session_fetch_by_lua:\d: session size: [a-fA-f\d]+|get session error: bad
 
 --- grep_error_log_out eval
 [
-'',
+'get session error: bad session in lua context
+',
 'get session error: bad session in lua context
 ',
 'get session error: bad session in lua context
@@ -220,7 +221,11 @@ In practice, never store session in plaintext on persistent storage.
  local ssl = require "ngx.ssl.session"
  local sid = ssl.get_session_id()
  print("session id: ", sid)
- local f = assert(io.open("$TEST_NGINX_SERVER_ROOT/html/session.tmp"))
+ local f = io.open("$TEST_NGINX_SERVER_ROOT/html/session.tmp")
+ if f == nil then
+ return
+ end
+
  local sess = f:read("*a")
  f:close()
  ssl.set_serialized_session(sess)
@@ -383,7 +388,10 @@ qr/failed to resume session: failed to de-serialize session|ssl_session_(fetch|s
 
 --- grep_error_log_out eval
 [
-qr/^ssl_session_store_by_lua\(nginx.conf:\d+\):5: session id: [a-fA-F\d]+$/s,
+qr/^ssl_session_fetch_by_lua\(nginx.conf:\d+\):4: session id: [a-fA-F\d]+
+failed to resume session: failed to de-serialize session
+ssl_session_store_by_lua\(nginx.conf:\d+\):5: session id: [a-fA-F\d]+
+$/s,
 qr/^ssl_session_fetch_by_lua\(nginx.conf:\d+\):4: session id: [a-fA-F\d]+
 failed to resume session: failed to de-serialize session
 ssl_session_store_by_lua\(nginx.conf:\d+\):5: session id: [a-fA-F\d]+
@@ -393,7 +401,6 @@ failed to resume session: failed to de-serialize session
 ssl_session_store_by_lua\(nginx.conf:\d+\):5: session id: [a-fA-F\d]+
 $/s,
 ]
-
 --- no_error_log
 [alert]
 [emerg]
@@ -527,7 +534,10 @@ $/s,
 
  ssl_session_fetch_by_lua_block {
  local ssl = require "ngx.ssl.session"
- local f = assert(io.open("$TEST_NGINX_SERVER_ROOT/html/session.tmp"))
+ local f = io.open("$TEST_NGINX_SERVER_ROOT/html/session.tmp")
+ if f == nil then
+ return
+ end
  local sess = f:read("*a")
  f:close()
  ssl.set_serialized_session(sess)