tests(plugins): refactor tests to address flakiness

(cherry picked from commit 2adad05)
Kong · Dec 12, 2023 · cc21cb2 · cc21cb2
1 parent 33c791f
commit cc21cb2
Showing 1 changed file with 21 additions and 25 deletions.
diff --git a/spec/03-plugins/17-ip-restriction/02-access_spec.lua b/spec/03-plugins/17-ip-restriction/02-access_spec.lua
@@ -581,19 +581,17 @@ for _, strategy in helpers.each_strategy() do
       })
       assert.res_status(200, res)
 
-      local cache_key = db.plugins:cache_key(plugin)
-
-      helpers.wait_for_invalidation(cache_key)
-
-      local res = assert(proxy_client:send {
-        method  = "GET",
-        path    = "/request",
-        headers = {
-          ["Host"] = "ip-restriction2.com"
-        }
-      })
-      local body = assert.res_status(403, res)
-      assert.matches("IP address not allowed", body)
+      helpers.pwait_until(function()
+        res = assert(proxy_client:send {
+          method  = "GET",
+          path    = "/request",
+          headers = {
+            ["Host"] = "ip-restriction2.com"
+          }
+        })
+        local body = assert.res_status(403, res)
+        assert.matches("IP address not allowed", body)
+      end)
 
       res = assert(admin_client:send {
         method  = "PATCH",
@@ -607,18 +605,16 @@ for _, strategy in helpers.each_strategy() do
       })
       assert.res_status(200, res)
 
-      local cache_key = db.plugins:cache_key(plugin)
-
-      helpers.wait_for_invalidation(cache_key)
-
-      local res = assert(proxy_client:send {
-        method  = "GET",
-        path    = "/request",
-        headers = {
-          ["Host"] = "ip-restriction2.com"
-        }
-      })
-      assert.res_status(200, res)
+      helpers.pwait_until(function()
+        res = assert(proxy_client:send {
+          method  = "GET",
+          path    = "/request",
+          headers = {
+            ["Host"] = "ip-restriction2.com"
+          }
+        })
+        assert.res_status(200, res)
+      end)
     end)
 
     describe("#regression", function()