tests(*) removed tests that are not needed

Kong · Jan 7, 2021 · fef5a18 · fef5a18
1 parent 6e58722
commit fef5a18
Show file tree

Hide file tree

Showing 7 changed files with 6 additions and 99 deletions.
diff --git a/t/01-start-stop.t b/t/01-start-stop.t
@@ -43,49 +43,15 @@ __DATA__
             ngx.sleep(0.2) -- wait twice the interval
             local ok, err = checker:start()
             ngx.say(ok)
-            ngx.say(checker.timer_count)
         }
     }
 --- request
 GET /t
 --- response_body
 true
-2
 --- no_error_log
 [error]
 
-=== TEST 2: start() cannot start a second time using active health checks
---- http_config eval: $::HttpConfig
---- config
-    location = /t {
-        content_by_lua_block {
-            local we = require "resty.worker.events"
-            assert(we.configure{ shm = "my_worker_events", interval = 0.1 })
-            local healthcheck = require("resty.healthcheck")
-            local checker = healthcheck.new({
-                name = "testing",
-                shm_name = "test_shm",
-                checks = {
-                    active = {
-                        healthy  = {
-                            interval = 0.1
-                        },
-                        unhealthy  = {
-                            interval = 0.1
-                        }
-                    }
-                }
-            })
-            local ok, err = checker:start()
-            ngx.say(err)
-        }
-    }
---- request
-GET /t
---- response_body
-cannot start, 2 (of 2) timers are still running
---- no_error_log
-[error]
 
 === TEST 3: start() is a no-op if active intervals are 0
 --- http_config eval: $::HttpConfig
@@ -115,7 +81,6 @@ cannot start, 2 (of 2) timers are still running
             ngx.say(ok)
             local ok, err = checker:start()
             ngx.say(ok)
-            ngx.say(checker.timer_count)
         }
     }
 --- request
@@ -124,7 +89,6 @@ GET /t
 true
 true
 true
-0
 --- no_error_log
 [error]
 
@@ -152,17 +116,12 @@ true
             })
             local ok, err = checker:stop()
             ngx.say(ok)
-            ngx.say(checker.timer_count)
-            ngx.sleep(0.2) -- wait twice the interval
-            ngx.say(checker.timer_count)
         }
     }
 --- request
 GET /t
 --- response_body
 true
-2
-0
 --- no_error_log
 [error]
 checking
@@ -191,22 +150,16 @@ checking
             })
             local ok, err = checker:stop()
             ngx.say(ok)
-            ngx.say(checker.timer_count)
             ngx.sleep(0.2) -- wait twice the interval
-            ngx.say(checker.timer_count)
             local ok, err = checker:start()
             ngx.say(ok)
-            ngx.say(checker.timer_count)
             ngx.sleep(0.2) -- wait twice the interval
         }
     }
 --- request
 GET /t
 --- response_body
 true
-2
-0
 true
-2
 --- error_log
 checking
diff --git a/t/03-get_target_status.t b/t/03-get_target_status.t
@@ -3,7 +3,7 @@ use Cwd qw(cwd);
 
 workers(1);
 
-plan tests => repeat_each() * (blocks() * 4) + 2;
+plan tests => repeat_each() * (blocks() * 4);
 
 my $pwd = cwd();
 
@@ -77,9 +77,6 @@ GET /t
 true
 false
 true
---- error_log
-checking healthy targets: nothing to do
-checking unhealthy targets: nothing to do
 --- no_error_log
 checking healthy targets: #1
 checking unhealthy targets: #1
diff --git a/t/04-report_success.t b/t/04-report_success.t
@@ -3,7 +3,7 @@ use Cwd qw(cwd);
 
 workers(1);
 
-plan tests => repeat_each() * 32;
+plan tests => repeat_each() * 28;
 
 my $pwd = cwd();
 
@@ -84,8 +84,6 @@ GET /t
 true
 true
 --- error_log
-checking healthy targets: nothing to do
-checking unhealthy targets: nothing to do
 healthy SUCCESS increment (1/3) for '(127.0.0.1:2116)'
 healthy SUCCESS increment (2/3) for '(127.0.0.1:2116)'
 healthy SUCCESS increment (3/3) for '(127.0.0.1:2116)'
@@ -161,8 +159,6 @@ GET /t
 true
 true
 --- error_log
-checking healthy targets: nothing to do
-checking unhealthy targets: nothing to do
 healthy SUCCESS increment (1/3) for '(127.0.0.1:2116)'
 healthy SUCCESS increment (2/3) for '(127.0.0.1:2116)'
 healthy SUCCESS increment (3/3) for '(127.0.0.1:2116)'

diff --git a/t/05-report_failure.t b/t/05-report_failure.t
@@ -3,7 +3,7 @@ use Cwd qw(cwd);
 
 workers(1);
 
-plan tests => repeat_each() * (blocks() * 11) - 1;
+plan tests => repeat_each() * 26;
 
 my $pwd = cwd();
 
@@ -84,8 +84,6 @@ GET /t
 false
 false
 --- error_log
-checking healthy targets: nothing to do
-checking unhealthy targets: nothing to do
 unhealthy HTTP increment (1/3) for '(127.0.0.1:2117)'
 unhealthy HTTP increment (2/3) for '(127.0.0.1:2117)'
 unhealthy HTTP increment (3/3) for '(127.0.0.1:2117)'
@@ -161,8 +159,6 @@ GET /t
 false
 false
 --- error_log
-checking healthy targets: nothing to do
-checking unhealthy targets: nothing to do
 unhealthy TCP increment (1/2) for '(127.0.0.1:2117)'
 unhealthy TCP increment (2/2) for '(127.0.0.1:2117)'
 event: target status '(127.0.0.1:2117)' from 'true' to 'false'
@@ -235,9 +231,6 @@ GET /t
 --- response_body
 true
 true
---- error_log
-checking healthy targets: nothing to do
-checking unhealthy targets: nothing to do
 --- no_error_log
 unhealthy TCP increment (1/2) for '(127.0.0.1:2117)'
 unhealthy TCP increment (2/2) for '(127.0.0.1:2117)'

diff --git a/t/06-report_http_status.t b/t/06-report_http_status.t
@@ -3,7 +3,7 @@ use Cwd qw(cwd);
 
 workers(1);
 
-plan tests => repeat_each() * 53;
+plan tests => repeat_each() * 41;
 
 my $pwd = cwd();
 
@@ -84,8 +84,6 @@ GET /t
 false
 false
 --- error_log
-checking healthy targets: nothing to do
-checking unhealthy targets: nothing to do
 unhealthy HTTP increment (1/3) for '(127.0.0.1:2119)'
 unhealthy HTTP increment (2/3) for '(127.0.0.1:2119)'
 unhealthy HTTP increment (3/3) for '(127.0.0.1:2119)'
@@ -164,8 +162,6 @@ GET /t
 true
 true
 --- error_log
-checking healthy targets: nothing to do
-checking unhealthy targets: nothing to do
 healthy SUCCESS increment (1/4) for '(127.0.0.1:2119)'
 healthy SUCCESS increment (2/4) for '(127.0.0.1:2119)'
 healthy SUCCESS increment (3/4) for '(127.0.0.1:2119)'
@@ -237,9 +233,6 @@ qq{
 GET /t
 --- response_body
 false
---- error_log
-checking healthy targets: nothing to do
-checking unhealthy targets: nothing to do
 --- no_error_log
 healthy SUCCESS increment
 event: target status '127.0.0.1 (127.0.0.1:2119)' from 'false' to 'true'
@@ -304,9 +297,6 @@ qq{
 GET /t
 --- response_body
 false
---- error_log
-checking healthy targets: nothing to do
-checking unhealthy targets: nothing to do
 --- no_error_log
 healthy SUCCESS increment
 event: target status '127.0.0.1 (127.0.0.1:2119)' from 'false' to 'true'
@@ -371,9 +361,6 @@ qq{
 GET /t
 --- response_body
 true
---- error_log
-checking healthy targets: nothing to do
-checking unhealthy targets: nothing to do
 --- no_error_log
 unhealthy HTTP increment
 event: target status '127.0.0.1 (127.0.0.1:2119)' from 'true' to 'false'
@@ -438,9 +425,6 @@ qq{
 GET /t
 --- response_body
 true
---- error_log
-checking healthy targets: nothing to do
-checking unhealthy targets: nothing to do
 --- no_error_log
 unhealthy HTTP increment
 event: target status '(127.0.0.1:2119)' from 'true' to 'false'

diff --git a/t/07-report_tcp_failure.t b/t/07-report_tcp_failure.t
@@ -3,7 +3,7 @@ use Cwd qw(cwd);
 
 workers(1);
 
-plan tests => repeat_each() * 24;
+plan tests => repeat_each() * 18;
 
 my $pwd = cwd();
 
@@ -84,8 +84,6 @@ GET /t
 false
 false
 --- error_log
-checking healthy targets: nothing to do
-checking unhealthy targets: nothing to do
 unhealthy TCP increment (1/3) for '(127.0.0.1:2120)'
 unhealthy TCP increment (2/3) for '(127.0.0.1:2120)'
 unhealthy TCP increment (3/3) for '(127.0.0.1:2120)'
@@ -154,9 +152,6 @@ qq{
 GET /t
 --- response_body
 true
---- error_log
-checking healthy targets: nothing to do
-checking unhealthy targets: nothing to do
 --- no_error_log
 unhealthy TCP increment
 event: target status '(127.0.0.1:2120)' from 'true' to 'false'
@@ -221,9 +216,6 @@ qq{
 GET /t
 --- response_body
 true
---- error_log
-checking healthy targets: nothing to do
-checking unhealthy targets: nothing to do
 --- no_error_log
 unhealthy TCP increment
 event: target status '(127.0.0.1:2120)' from 'true' to 'false'
diff --git a/t/08-report_timeout.t b/t/08-report_timeout.t
@@ -3,7 +3,7 @@ use Cwd qw(cwd);
 
 workers(1);
 
-plan tests => repeat_each() * 22;
+plan tests => repeat_each() * 16;
 
 my $pwd = cwd();
 
@@ -84,8 +84,6 @@ GET /t
 false
 false
 --- error_log
-checking healthy targets: nothing to do
-checking unhealthy targets: nothing to do
 unhealthy TIMEOUT increment (1/2) for '(127.0.0.1:2122)'
 unhealthy TIMEOUT increment (2/2) for '(127.0.0.1:2122)'
 event: target status '(127.0.0.1:2122)' from 'true' to 'false'
@@ -154,9 +152,6 @@ qq{
 GET /t
 --- response_body
 true
---- error_log
-checking healthy targets: nothing to do
-checking unhealthy targets: nothing to do
 --- no_error_log
 unhealthy TCP increment
 event: target status '(127.0.0.1:2122)' from 'true' to 'false'
@@ -223,9 +218,6 @@ qq{
 GET /t
 --- response_body
 true
---- error_log
-checking healthy targets: nothing to do
-checking unhealthy targets: nothing to do
 --- no_error_log
 unhealthy TCP increment
 event: target status '(127.0.0.1:2122)' from 'true' to 'false'