Allow overriding clock so tests do not sleep

frioux · Nov 9, 2015 · 19e94f6 · 19e94f6
1 parent 1bcdc1d
commit 19e94f6
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 11 deletions.
diff --git a/lib/DBIx/Class/QueryLog.pm b/lib/DBIx/Class/QueryLog.pm
@@ -35,6 +35,13 @@ has passthrough => (
     default => 0
 );
 
+has __time => (
+    is => 'ro',
+    default => sub { \&Time::HiRes::time },
+);
+
+sub _time { shift->__time->() }
+
 before 'add_to_log' => sub {
     my ($self, $thing) = @_;
 
@@ -173,7 +180,7 @@ sub txn_begin {
     $self->next::method(@_) if $self->passthrough;
     $self->current_transaction(
         $self->transaction_class()->new({
-            start_time => Time::HiRes::time
+            start_time => $self->_time,
         })
     );
 }
@@ -190,7 +197,7 @@ sub txn_commit {
     $self->next::method(@_) if $self->passthrough;
     if(defined($self->current_transaction)) {
         my $txn = $self->current_transaction;
-        $txn->end_time(Time::HiRes::time);
+        $txn->end_time($self->_time);
         $txn->committed(1);
         $txn->rolledback(0);
         $self->add_to_log($txn);
@@ -212,7 +219,7 @@ sub txn_rollback {
     $self->next::method(@_) if $self->passthrough;
     if(defined($self->current_transaction)) {
         my $txn = $self->current_transaction;
-        $txn->end_time(Time::HiRes::time);
+        $txn->end_time($self->_time);
         $txn->committed(0);
         $txn->rolledback(1);
         $self->add_to_log($txn);
@@ -236,7 +243,7 @@ sub query_start {
     $self->next::method($sql, @params) if $self->passthrough;
     $self->current_query(
         $self->query_class()->new({
-            start_time  => Time::HiRes::time,
+            start_time  => $self->_time,
             sql         => $sql,
             params      => \@params,
         })
@@ -255,7 +262,7 @@ sub query_end {
     $self->next::method(@_) if $self->passthrough;
     if(defined($self->current_query)) {
         my $q = $self->current_query;
-        $q->end_time(Time::HiRes::time);
+        $q->end_time($self->_time);
         $q->bucket($self->bucket);
         if(defined($self->current_transaction)) {
             $self->current_transaction->add_to_queries($q);

diff --git a/t/02-analyzer.t b/t/02-analyzer.t
@@ -10,7 +10,11 @@ BEGIN {
 }
 require_ok('DBIx::Class::QueryLog::Analyzer');
 
-my $ql = DBIx::Class::QueryLog->new;
+my $time = 0;
+
+my $ql = DBIx::Class::QueryLog->new(
+    __time => sub { $time },
+);
 ok($ql->isa('DBIx::Class::QueryLog'), 'new');
 
 $ql->query_start('SELECT * from foo');
@@ -22,7 +26,7 @@ $ql->query_start('SELECT * from foo');
 $ql->query_end('SELECT * from foo');
 
 $ql->query_start('SELECT * from bar');
-sleep(1);
+$time += 1;
 $ql->query_end('SELECT * from bar');
 
 $ql->txn_commit;
@@ -47,4 +51,4 @@ cmp_ok($analyzed->{$keys[1]}->{'count'}, '==', 2, '2 executions');
 
 ok($analyzed->{$keys[0]}->{'time_elapsed'}, 'Total time');
 cmp_ok(scalar(@{$analyzed->{$keys[0]}->{'queries'}}), '==', 1, '1 stored queries');
-cmp_ok(scalar(@{$analyzed->{$keys[1]}->{'queries'}}), '==', 2, '2 stored queries');
+cmp_ok(scalar(@{$analyzed->{$keys[1]}->{'queries'}}), '==', 2, '2 stored queries');
diff --git a/t/04-fastslow.t b/t/04-fastslow.t
@@ -8,20 +8,24 @@ use DBIx::Class::QueryLog::Analyzer;
 use DBIx::Class::QueryLog::Query;
 use DBIx::Class::QueryLog::Transaction;
 
-my $ql = DBIx::Class::QueryLog->new;
+my $time = 0;
+
+my $ql = DBIx::Class::QueryLog->new(
+    __time => sub { $time },
+);
 $ql->query_start('SELECT * from foo', 'fast');
 $ql->query_end('SELECT * from foo', 'fast');
 
 $ql->query_start('SELECT * from foo2', 'fast');
 $ql->query_end('SELECT * from foo2', 'fast');
 
 $ql->query_start('SELECT * from foo', 'slow');
-sleep(3);
+$time += 3;
 $ql->query_end('SELECT * from foo', 'slow');
 
 $ql->txn_begin;
 $ql->query_start('SELECT * from foo', 'medium');
-sleep(2);
+$time += 2;
 $ql->query_end('SELECT * from foo', 'medium');
 $ql->txn_commit;