better timing tests for delays

mojolicious · Apr 5, 2013 · cd04cd8 · cd04cd8
1 parent 3afd358
commit cd04cd8
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 9 deletions.
diff --git a/lib/Mojo/IOLoop/Delay.pm b/lib/Mojo/IOLoop/Delay.pm
@@ -57,7 +57,7 @@ sub _step {
 
   return 0 if $self->{pending};
   if ($self->{counter}) { $self->ioloop->timer(0 => $self->begin) }
-  else { $self->emit(finish => @args) unless $self->{counter} }
+  else                  { $self->emit(finish => @args) }
   return 0;
 }
 
@@ -127,7 +127,8 @@ emit the following new ones.
     ...
   });
 
-Emitted once the active event counter reaches zero.
+Emitted once the active event counter reaches zero and there are no more
+steps.
 
 =head1 ATTRIBUTES
 
@@ -152,9 +153,9 @@ implements the following new ones.
   my $cb = $delay->begin(0);
 
 Increment active event counter, the returned callback can be used to decrement
-the active event counter again, all arguments are queued in the right order
-for the next step or C<finish> event and C<wait> method. The first argument
-passed to the callback will be ignored by default.
+the active event counter again. Arguments passed to the callback are queued in
+the right order for the next step or C<finish> event and C<wait> method, the
+first argument will be ignored by default.
 
   # Capture all arguments
   my $delay = Mojo::IOLoop->delay;
@@ -167,7 +168,8 @@ passed to the callback will be ignored by default.
 
 Sequentialize multiple events, the first callback will run right away, and the
 next one once the active event counter reaches zero, this chain will continue
-until there are no more callbacks or active events left.
+until there are no more callbacks or a callback does not increment the active
+event counter.
 
 =head2 wait
 

diff --git a/t/mojo/delay.t b/t/mojo/delay.t
@@ -143,15 +143,15 @@ $delay = Mojo::IOLoop->delay(
     $end2->(4);
     $end3->(5, 6);
     $end->(1, 2, 3);
-    Mojo::IOLoop->timer(0 => $first->begin);
+    $first->begin(0)->(23);
   },
   sub {
     my ($first, @numbers) = @_;
     push @$result, @numbers;
   }
 );
-is_deeply [$delay->wait], [2, 3, 2, 1, 4, 5, 6], 'right numbers';
+is_deeply [$delay->wait], [2, 3, 2, 1, 4, 5, 6, 23], 'right numbers';
 is $finished, 1, 'finish event has been emitted once';
-is_deeply $result, [1, 2, 3, 2, 3, 2, 1, 4, 5, 6], 'right numbers';
+is_deeply $result, [1, 2, 3, 2, 3, 2, 1, 4, 5, 6, 23], 'right numbers';
 
 done_testing();