test reset with next_tick

mojolicious · Apr 27, 2015 · 2c26e31 · 2c26e31
1 parent 8d28581
commit 2c26e31
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/lib/Mojo/Reactor/Poll.pm b/lib/Mojo/Reactor/Poll.pm
@@ -23,7 +23,7 @@ sub is_running { !!shift->{running} }
 sub next_tick {
   my ($self, $cb) = @_;
   push @{$self->{next_tick}}, $cb;
-  $self->{next} //= $self->timer(0 => \&_tick);
+  $self->{next_timer} //= $self->timer(0 => \&_next);
   return undef;
 }
 
@@ -91,7 +91,7 @@ sub remove {
   return !!delete $self->{io}{fileno $remove};
 }
 
-sub reset { delete @{shift()}{qw(io next next_tick timers)} }
+sub reset { delete @{shift()}{qw(io next_tick next_timer timers)} }
 
 sub start {
   my $self = shift;
@@ -121,9 +121,9 @@ sub _id {
   return $id;
 }
 
-sub _tick {
+sub _next {
   my $self = shift;
-  delete $self->{next};
+  delete $self->{next_timer};
   while (my $cb = shift @{$self->{next_tick}}) { $self->$cb }
 }
 

diff --git a/t/mojo/reactor_ev.t b/t/mojo/reactor_ev.t
@@ -138,9 +138,10 @@ ok !$timer, 'timer was not triggered';
 ok $recurring, 'recurring was triggered again';
 
 # Reset
+$reactor->next_tick(sub { die 'Reset failed' });
 $reactor->reset;
 ($readable, $writable, $recurring) = ();
-$reactor->timer(0.025 => sub { shift->stop });
+$reactor->next_tick(sub { shift->stop });
 $reactor->start;
 ok !$readable,  'io event was not triggered again';
 ok !$writable,  'io event was not triggered again';

diff --git a/t/mojo/reactor_poll.t b/t/mojo/reactor_poll.t
@@ -135,9 +135,10 @@ ok !$timer, 'timer was not triggered';
 ok $recurring, 'recurring was triggered again';
 
 # Reset
+$reactor->next_tick(sub { die 'Reset failed' });
 $reactor->reset;
 ($readable, $writable, $recurring) = ();
-$reactor->timer(0.025 => sub { shift->stop });
+$reactor->next_tick(sub { shift->stop });
 $reactor->start;
 ok !$readable,  'io event was not triggered again';
 ok !$writable,  'io event was not triggered again';