Tests: adjusted proxy_limit_rate tests.

Notably, the end time is now also taken from nginx for accuracy.

Author: pluknet

proxy_limit_rate.t

@@ -15,7 +15,7 @@ use Test::More;
 BEGIN { use FindBin; chdir($FindBin::Bin); }
 
 use lib 'lib';
-use Test::Nginx;
+use Test::Nginx qw/ :DEFAULT http_content /;
 
 ###############################################################################
 
@@ -45,20 +45,19 @@ http {
         listen       127.0.0.1:8080;
         server_name  localhost;
 
+        proxy_limit_rate 20000;
+        proxy_buffer_size 4k;
+
         location / {
             proxy_pass http://127.0.0.1:8080/data;
-            proxy_buffer_size 4k;
-            proxy_limit_rate 20000;
-            add_header X-Msec $msec;
+            add_header  X-Msec $msec;
+            add_trailer X-Msec $msec;
         }
 
         location /keepalive {
             proxy_http_version 1.1;
             proxy_set_header Connection "";
             proxy_pass http://u/data;
-            proxy_buffer_size 4k;
-            proxy_limit_rate 20000;
-            add_header X-Msec $msec;
         }
 
         location /data {
@@ -73,15 +72,10 @@ $t->run();
 
 ###############################################################################
 
-my $r = http_get('/');
-
-my ($t1) = $r =~ /X-Msec: (\d+)/;
-my $diff = time() - $t1;
-
-# four chunks are split with three 1s delays
+my ($body, $t1, $t2) = get('/');
 
-cmp_ok($diff, '>=', 1, 'proxy_limit_rate');
-like($r, qr/^(XXXXXXXXXX){4000}\x0d?\x0a?$/m, 'response body');
+cmp_ok($t2 - $t1, '>=', 1, 'proxy_limit_rate');
+is($body, 'X' x 40000, 'response body');
 
 # in case keepalive connection was saved with the delayed flag,
 # the read timer used to be a delay timer in the next request
@@ -90,3 +84,17 @@ like(http_get('/keepalive'), qr/200 OK/, 'keepalive');
 like(http_get('/keepalive'), qr/200 OK/, 'keepalive 2');
 
 ###############################################################################
+
+sub get {
+	my ($uri) = @_;
+	my $r = http(<<EOF);
+GET $uri HTTP/1.1
+Host: localhost
+Connection: close
+
+EOF
+
+	http_content($r), $r =~ /X-Msec: (\d+)/g;
+}
+
+###############################################################################