Mercurial > hg > nginx-tests

comparison proxy_cache_lock.t @ 233:1a5574d84917

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Tests: tweak various timeouts and replace sleep() with select(). Hopefully this will result in less spurious test failures, in particular on our Solaris VM.
author Maxim Dounin <mdounin@mdounin.ru>
date Mon, 10 Sep 2012 20:18:05 +0400
parents f9325406df0b
children 6a0d934950bc
comparison
equal deleted inserted replaced
232:4c43b3a0117c 233:1a5574d84917
54 location /timeout { 54 location /timeout {
55 proxy_pass http://127.0.0.1:8081; 55 proxy_pass http://127.0.0.1:8081;
56 proxy_cache NAME; 56 proxy_cache NAME;
57 57
58 proxy_cache_lock on; 58 proxy_cache_lock on;
59 proxy_cache_lock_timeout 300ms; 59 proxy_cache_lock_timeout 200ms;
60 } 60 }
61 61
62 location /nolock { 62 location /nolock {
63 proxy_pass http://127.0.0.1:8081; 63 proxy_pass http://127.0.0.1:8081;
64 proxy_cache NAME; 64 proxy_cache NAME;
135 my $request = "GET $uri HTTP/1.0" . CRLF . CRLF; 135 my $request = "GET $uri HTTP/1.0" . CRLF . CRLF;
136 136
137 eval { 137 eval {
138 local $SIG{ALRM} = sub { die "timeout\n" }; 138 local $SIG{ALRM} = sub { die "timeout\n" };
139 local $SIG{PIPE} = sub { die "sigpipe\n" }; 139 local $SIG{PIPE} = sub { die "sigpipe\n" };
140 alarm(2); 140 alarm(3);
141 $s = IO::Socket::INET->new( 141 $s = IO::Socket::INET->new(
142 Proto => 'tcp', 142 Proto => 'tcp',
143 PeerAddr => '127.0.0.1:8080' 143 PeerAddr => '127.0.0.1:8080'
144 ); 144 );
145 log_out($request); 145 log_out($request);
159 my $reply; 159 my $reply;
160 160
161 eval { 161 eval {
162 local $SIG{ALRM} = sub { die "timeout\n" }; 162 local $SIG{ALRM} = sub { die "timeout\n" };
163 local $SIG{PIPE} = sub { die "sigpipe\n" }; 163 local $SIG{PIPE} = sub { die "sigpipe\n" };
164 alarm(2); 164 alarm(3);
165 local $/; 165 local $/;
166 $reply = $s->getline(); 166 $reply = $s->getline();
167 log_in($reply); 167 log_in($reply);
168 alarm(0); 168 alarm(0);
169 }; 169 };
202 last if /^\x0d?\x0a?$/; 202 last if /^\x0d?\x0a?$/;
203 } 203 }
204 204
205 next unless $uri; 205 next unless $uri;
206 206
207 sleep(1); 207 select(undef, undef, undef, 0.5);
208 208
209 $num++; 209 $num++;
210 print $client <<"EOF"; 210 print $client <<"EOF";
211 HTTP/1.1 200 OK 211 HTTP/1.1 200 OK
212 Cache-Control: max-age=300 212 Cache-Control: max-age=300