fixed a few small timing bugs in TLS tests

mojolicious · Aug 12, 2012 · 5d132cb · 5d132cb
1 parent a172da1
commit 5d132cb
Show file tree

Hide file tree

Showing 3 changed files with 125 additions and 78 deletions.
diff --git a/Changes b/Changes
@@ -2,6 +2,7 @@
 3.29  2012-08-12
   - Improved documentation.
   - Improved tests.
+  - Fixed small timing bugs in WebSocket and TLS tests.
 
 3.28  2012-08-10
   - Added skip_body attribute to Mojo::Content.

diff --git a/t/mojo/ioloop_ipv6.t b/t/mojo/ioloop_ipv6.t
@@ -15,24 +15,28 @@ plan tests => 2;
 use Mojo::IOLoop;
 
 # IPv6 roundtrip
-my $loop = Mojo::IOLoop->new;
-my $port = Mojo::IOLoop->generate_port;
+my $delay = Mojo::IOLoop->delay;
+my $port  = Mojo::IOLoop->generate_port;
 my ($server, $client);
-$loop->server(
+$delay->begin;
+Mojo::IOLoop->server(
   {address => '[::1]', port => $port} => sub {
     my ($loop, $stream) = @_;
     $stream->write('test' => sub { shift->write('321') });
+    $stream->on(close => sub { $delay->end });
     $stream->on(read => sub { $server .= pop });
+    $stream->timeout(0.5);
   }
 );
-$loop->client(
+$delay->begin;
+Mojo::IOLoop->client(
   {address => '[::1]', port => $port} => sub {
     my ($loop, $err, $stream) = @_;
     $stream->write('tset' => sub { shift->write('123') });
+    $stream->on(close => sub { $delay->end });
     $stream->on(read => sub { $client .= pop });
   }
 );
-$loop->timer(1 => sub { shift->stop });
-$loop->start;
+$delay->wait;
 is $server, 'tset123', 'right content';
 is $client, 'test321', 'right content';