Francois Gouget : testbot: Use the same 'now' for all activity values.

[Alexandre Julliard]

Module: tools
Branch: master
Commit: c10d1f8818a445ddd047814c316098eeaa6193fd
URL:    https://source.winehq.org/git/tools.git/?a=commit;h=c10d1f8818a445ddd047814c316098eeaa6193fd

Author: Francois Gouget <fgouget at codeweavers.com>
Date:   Wed Feb  7 05:30:55 2018 +0100

testbot: Use the same 'now' for all activity values.

The code was calling time() in various places which could result in
different notions of when 'now' is depending on the place.

Signed-off-by: Francois Gouget <fgouget at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 testbot/lib/WineTestBot/Activity.pm | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/testbot/lib/WineTestBot/Activity.pm b/testbot/lib/WineTestBot/Activity.pm
index a2bd1b0..8c22e01 100644
--- a/testbot/lib/WineTestBot/Activity.pm
+++ b/testbot/lib/WineTestBot/Activity.pm
@@ -106,12 +106,13 @@ sub GetActivity($;$)
 {
   my ($VMs, $Seconds) = @_;
   my ($ActivityHash, $Activity, $Counters) = ({}, [], {});
+  $Counters->{now} = time();
 
   ### First load all the RecordGroups
   my $RecordGroups = CreateRecordGroups();
   if ($Seconds)
   {
-    $RecordGroups->AddFilter("Timestamp", [time() - $Seconds], ">=");
+    $RecordGroups->AddFilter("Timestamp", [$Counters->{now} - $Seconds], ">=");
   }
   my $MinId;
   $Counters->{recordgroups} = $RecordGroups->GetItemsCount();
@@ -302,13 +303,13 @@ sub GetActivity($;$)
       $LastStatusVMs{$VM->Name} = $StatusVMs;
     }
   }
-  $LastGroup->{end} = time() if ($LastGroup);
+  $LastGroup->{end} = $Counters->{now} if ($LastGroup);
 
   foreach my $VM (@{$VMs->GetItems()})
   {
     my $LastVMStatus = $LastStatusVMs{$VM->Name}->{$VM->Name};
     next if (!$LastVMStatus);
-    $LastVMStatus->{end} = time();
+    $LastVMStatus->{end} = $Counters->{now};
     if ($LastVMStatus->{status} eq "unknown")
     {
       $LastVMStatus->{status} = $VM->Status;