瀏覽代碼

better implimentation for warning timeout

Keita Jamadam Sugama 4 年之前
父節點
當前提交
176e502037
共有 2 個文件被更改,包括 8 次插入3 次删除
  1. 3 3
      lib/Selenium/Waiter.pm
  2. 5 0
      t/13-waiter.t

+ 3 - 3
lib/Selenium/Waiter.pm

@@ -93,9 +93,7 @@ sub wait_until (&%) {
     my $start               = time;
     my $timeout_not_elapsed = sub {
         my $elapsed = time - $start;
-        my $ret = $elapsed < $args->{timeout};
-        warn 'timeout' if ( !$ret && $args->{debug} );
-        return $ret;
+        return $elapsed < $args->{timeout};
     };
 
     my $exception = '';
@@ -120,6 +118,8 @@ sub wait_until (&%) {
         return $try_ret if $try_ret;
     }
 
+    warn 'timeout' if $args->{debug};
+    
     # No need to repeat ourselves if we're already debugging.
     warn $exception if $exception && !$args->{debug};
     return '';

+ 5 - 0
t/13-waiter.t

@@ -10,11 +10,16 @@ use Test::More;
 my $res;
 
 subtest 'basic' => sub {
+    my @warning;
+    local $SIG{__WARN__} = sub { push( @warning, $_[0] ) };
+
     $res = wait_until { 1 };
     is $res, 1, 'right return value';
 
     $res = wait_until { 0 } timeout => 1;
     is $res, '', 'right return value';
+
+    is( scalar @warning, 0, 'no warnings' );
 };
 
 subtest 'exception' => sub {