tests(*) harden a few test cases, specifically for OpenResty 1.15.8.1

thibaultcha · May 28, 2019 · e2f14cc · e2f14cc
1 parent 2e4d01b
commit e2f14cc
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 3 deletions.
diff --git a/t/06-cluster.t b/t/06-cluster.t
@@ -998,7 +998,7 @@ coordinator 3: 127.0.0.1
 --- request
 GET /t
 --- response_body_like chomp
-all hosts tried for query failed\. 127\.0\.0\.\d+: host still considered down for 0\.[678]\d+s \(last error: not recorded\)\. 127\.0\.0\.\d+: host still considered down for 0\.[678]\d+s \(last error: not recorded\)\. 127\.0\.0\.\d+: host still considered down for 0\.[678]\d+s \(last error: not recorded\)
+all hosts tried for query failed\. 127\.0\.0\.\d+: host still considered down for 0\.\d+s \(last error: not recorded\)\. 127\.0\.0\.\d+: host still considered down for 0\.\d+s \(last error: not recorded\)\. 127\.0\.0\.\d+: host still considered down for 0\.\d+s \(last error: not recorded\)
 --- no_error_log
 [error]
 

diff --git a/t/14-lb_req_dc_rr.t b/t/14-lb_req_dc_rr.t
@@ -312,7 +312,24 @@ local_dc: dc1
 --- config
     location /t {
         content_by_lua_block {
-            ngx.ctx = nil
+            if rawget(ngx, "ctx") == nil then
+                -- OpenResty >= 1.15.8.1
+                local __ngx_index = getmetatable(ngx)
+
+                setmetatable(ngx, {
+                    __index = function(t, k)
+                        if k == "ctx" then
+                            return
+                        end
+
+                        return __ngx_index(t, k)
+                    end
+                })
+
+            else
+                -- OpenResty <= 1.13.6.2
+                ngx.ctx = nil
+            end
 
             local req_dc_rr = require 'resty.cassandra.policies.lb.req_dc_rr'
             ngx.say(req_dc_rr.name)

diff --git a/t/15-req_rr.t b/t/15-req_rr.t
@@ -167,7 +167,25 @@ req_round_robin
 --- config
     location /t {
         content_by_lua_block {
-            ngx.ctx = nil
+            if rawget(ngx, "ctx") == nil then
+                -- OpenResty >= 1.15.8.1
+                local __ngx_index = getmetatable(ngx)
+
+                setmetatable(ngx, {
+                    __index = function(t, k)
+                        if k == "ctx" then
+                            return
+                        end
+
+                        return __ngx_index(t, k)
+                    end
+                })
+
+            else
+                -- OpenResty <= 1.13.6.2
+                ngx.ctx = nil
+            end
+
             local lb_req_rr = require 'resty.cassandra.policies.lb.req_rr'
             ngx.say(lb_req_rr.name)