comparison proxy_variables.t @ 586:ef2b435c1048

Tests: simple tests for $upstream_connect_time.
author Sergey Kandaurov <pluknet@nginx.com>
date Wed, 20 May 2015 19:18:42 +0300
parents 907e89fba9c3
children dbe5bc4b8b39
comparison
equal deleted inserted replaced
585:5bb19f7448b5 586:ef2b435c1048
20 ############################################################################### 20 ###############################################################################
21 21
22 select STDERR; $| = 1; 22 select STDERR; $| = 1;
23 select STDOUT; $| = 1; 23 select STDOUT; $| = 1;
24 24
25 my $t = Test::Nginx->new()->has(qw/http proxy/)->plan(8) 25 my $t = Test::Nginx->new()->has(qw/http proxy/)
26 ->write_file_expand('nginx.conf', <<'EOF'); 26 ->write_file_expand('nginx.conf', <<'EOF');
27 27
28 %%TEST_GLOBALS%% 28 %%TEST_GLOBALS%%
29 29
30 daemon off; 30 daemon off;
38 upstream u { 38 upstream u {
39 server 127.0.0.1:8081; 39 server 127.0.0.1:8081;
40 server 127.0.0.1:8081; 40 server 127.0.0.1:8081;
41 } 41 }
42 42
43 log_format time $upstream_header_time:$upstream_response_time; 43 log_format time '$upstream_connect_time:$upstream_header_time:'
44 '$upstream_response_time';
44 45
45 server { 46 server {
46 listen 127.0.0.1:8080; 47 listen 127.0.0.1:8080;
47 server_name localhost; 48 server_name localhost;
48 49
50 add_header X-Connect $upstream_connect_time;
51 add_header X-Header $upstream_header_time;
52 add_header X-Response $upstream_response_time;
53
49 location / { 54 location / {
50 add_header X-Header-Time $upstream_header_time;
51 proxy_pass http://127.0.0.1:8081; 55 proxy_pass http://127.0.0.1:8081;
52 access_log %%TESTDIR%%/time.log time; 56 access_log %%TESTDIR%%/time.log time;
53 } 57 }
54 58
55 location /pnu { 59 location /pnu {
56 add_header X-Header-Time $upstream_header_time;
57 add_header X-Response-Time $upstream_response_time;
58 proxy_pass http://u/bad; 60 proxy_pass http://u/bad;
59 } 61 }
60 } 62 }
61 } 63 }
62 64
63 EOF 65 EOF
64 66
65 $t->run_daemon(\&http_daemon, 8081); 67 $t->run_daemon(\&http_daemon, 8081);
66 $t->run()->waitforsocket('127.0.0.1:8081'); 68 $t->try_run('no upstream_connect_time')->plan(15);
69
70 $t->waitforsocket('127.0.0.1:8081');
67 71
68 ############################################################################### 72 ###############################################################################
69 73
70 my $re = qr/(\d\.\d{3})/; 74 my $re = qr/(\d\.\d{3})/;
71 my ($ht, $rt, $ht2, $rt2); 75 my ($ct, $ht, $rt, $ct2, $ht2, $rt2);
72 76
73 ($ht) = http_get('/header') =~ /X-Header-Time: $re/; 77 ($ct, $ht) = get('/header');
78 cmp_ok($ct, '<', 1, 'connect time - slow response header');
74 cmp_ok($ht, '>=', 1, 'header time - slow response header'); 79 cmp_ok($ht, '>=', 1, 'header time - slow response header');
75 80
76 ($ht) = http_get('/body') =~ /X-Header-Time: $re/; 81 ($ct, $ht) = get('/body');
82 cmp_ok($ct, '<', 1, 'connect time - slow response body');
77 cmp_ok($ht, '<', 1, 'header time - slow response body'); 83 cmp_ok($ht, '<', 1, 'header time - slow response body');
78 84
79 my $r = http_get('/pnu'); 85 ($ct, $ct2, $ht, $ht2, $rt) = get('/pnu', many => 1);
80 ($ht) = $r =~ /X-Header-Time: ($re)/; 86 cmp_ok($ct, '<', 1, 'connect time - next');
81 ($rt) = $r =~ /X-Response-Time: ($re)/; 87 cmp_ok($ct2, '<', 1, 'connect time - next 2');
82 88 cmp_ok($ht, '>=', 1, 'header time - next');
89 cmp_ok($ht2, '<', 1, 'header time - next 2');
83 is($ht, $rt, 'header time - bad response'); 90 is($ht, $rt, 'header time - bad response');
84 like($r, qr/X-Header-Time: $re, $re/, 'header time - next');
85 91
86 $t->stop(); 92 $t->stop();
87 93
88 ($ht, $rt, $ht2, $rt2) = $t->read_file('time.log') =~ /^$re:$re\n$re:$re$/; 94 ($ct, $ht, $rt, $ct2, $ht2, $rt2)
95 = $t->read_file('time.log') =~ /^$re:$re:$re\n$re:$re:$re$/;
96
97 cmp_ok($ct, '<', 1, 'connect time log - slow response header');
98 cmp_ok($ct2, '<', 1, 'connect time log - slow response body');
89 99
90 cmp_ok($ht, '>=', 1, 'header time log - slow response header'); 100 cmp_ok($ht, '>=', 1, 'header time log - slow response header');
91 cmp_ok($ht2, '<', 1, 'header time log - slow response body'); 101 cmp_ok($ht2, '<', 1, 'header time log - slow response body');
92 102
93 cmp_ok($rt, '>=', 1, 'response time log - slow response header'); 103 cmp_ok($rt, '>=', 1, 'response time log - slow response header');
94 cmp_ok($rt2, '>=', 1, 'response time log - slow response body'); 104 cmp_ok($rt2, '>=', 1, 'response time log - slow response body');
95 105
96 ############################################################################### 106 ###############################################################################
107
108 sub get {
109 my ($uri, %extra) = @_;
110 my $re = $extra{many} ? qr/$re, $re?/ : $re;
111 my $r = http_get($uri);
112 $r =~ /X-Connect: $re/, $r =~ /X-Header: $re/, $r =~ /X-Response: $re/;
113 }
97 114
98 sub http_daemon { 115 sub http_daemon {
99 my ($port) = @_; 116 my ($port) = @_;
100 my $once = 1; 117 my $once = 1;
101 118