[PATCH] testbot: Use the same 'now' for all activity values.
Francois Gouget
fgouget at codeweavers.com
Tue Feb 6 22:30:55 CST 2018
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>
---
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 a2bd1b00a..8c22e0144 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;
--
2.15.1
More information about the wine-devel
mailing list