Tests: tuned periodic test for delays.

diff --git a/nginx/t/js_periodic.t b/nginx/t/js_periodic.t
index d6868935d1af147596af65cfdcd5afe365ee3eb3..7e1345881b90a937fa83910432a0cd74bf7fbbb4 100644 (file)
--- a/nginx/t/js_periodic.t
+++ b/nginx/t/js_periodic.t
@@ -56,7 +56,7 @@ http {
         server_name  localhost;
 
         location @periodic {
-            js_periodic test.tick interval=30ms jitter=1ms;
+            js_periodic test.tick interval=20ms jitter=1ms;
             js_periodic test.timer interval=1s worker_affinity=all;
             js_periodic test.overrun interval=30ms;
             js_periodic test.affinity interval=50ms worker_affinity=0101;

diff --git a/nginx/t/js_periodic_fetch.t b/nginx/t/js_periodic_fetch.t
index a323afb83ef7d13a5017cba01d0bfd2e488a460f..3938513251dc53761b53ea045b7b9907eed293be 100644 (file)
--- a/nginx/t/js_periodic_fetch.t
+++ b/nginx/t/js_periodic_fetch.t
@@ -99,12 +99,11 @@ $t->write_file('test.js', <<EOF);
      }
 
     function test_fetch(r) {
-        r.return(200, ngx.shared.strings.get('fetch').startsWith('okok'));
+        r.return(200, ngx.shared.strings.get('fetch'));
     }
 
     function test_multiple_fetches(r) {
-        r.return(200, ngx.shared.strings.get('multiple_fetches')
-                                                        .startsWith('ok\@foo'));
+        r.return(200, ngx.shared.strings.get('multiple_fetches'));
     }
 
     export default { fetch, fetch_exception, multiple_fetches, test_fetch,
@@ -119,8 +118,8 @@ $t->plan(3);
 
 select undef, undef, undef, 0.1;
 
-like(http_get('/test_fetch'), qr/true/, 'periodic fetch test');
-like(http_get('/test_multiple_fetches'), qr/true/, 'multiple fetch test');
+like(http_get('/test_fetch'), qr/(ok)+/, 'periodic fetch test');
+like(http_get('/test_multiple_fetches'), qr/ok\@foo/, 'multiple fetch test');
 
 $t->stop();