Francois Gouget : testbot/VMs: Make the WaitForToolsInGuest() timeout configurable.
Alexandre Julliard
julliard at winehq.org
Mon Oct 15 14:34:12 CDT 2012
Module: tools
Branch: master
Commit: ad55676a9ad5e62856444bd236adfb644adec1fd
URL: http://source.winehq.org/git/tools.git/?a=commit;h=ad55676a9ad5e62856444bd236adfb644adec1fd
Author: Francois Gouget <fgouget at codeweavers.com>
Date: Mon Oct 15 15:35:19 2012 +0200
testbot/VMs: Make the WaitForToolsInGuest() timeout configurable.
---
testbot/lib/WineTestBot/Config.pm | 14 ++++++++------
testbot/lib/WineTestBot/VMs.pm | 2 +-
2 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/testbot/lib/WineTestBot/Config.pm b/testbot/lib/WineTestBot/Config.pm
index f547a64..353b429 100644
--- a/testbot/lib/WineTestBot/Config.pm
+++ b/testbot/lib/WineTestBot/Config.pm
@@ -27,9 +27,9 @@ WineTestBot::Config - Site-independent configuration settings
use vars qw (@ISA @EXPORT @EXPORT_OK $UseSSL $LogDir $DataDir $BinDir
$VixHostType $VixHostUsername $VixHostPassword
$VixGuestUsername $VixGuestPassword $DbDataSource $DbUsername
- $DbPassword $MaxRevertingVMs $MaxRunningVMs $MaxExtraPoweredOnVms $SleepAfterRevert
- $AdminEMail $RobotEMail $WinePatchToOverride $WinePatchCc
- $SuiteTimeout $SingleTimeout
+ $DbPassword $MaxRevertingVMs $MaxRunningVMs $MaxExtraPoweredOnVms
+ $SleepAfterRevert $WaitForToolsInVM $AdminEMail $RobotEMail
+ $WinePatchToOverride $WinePatchCc $SuiteTimeout $SingleTimeout
$BuildTimeout $ReconfigTimeout $OverheadTimeout $TagPrefix
$ProjectName $PatchesMailingList $PatchResultsEMail $LDAPServer
$LDAPBindDN $LDAPSearchBase $LDAPSearchFilter
@@ -40,9 +40,10 @@ require Exporter;
@ISA = qw(Exporter);
@EXPORT = qw($UseSSL $LogDir $DataDir $BinDir $VixHostType
$VixHostUsername $VixHostPassword $VixGuestUsername
- $VixGuestPassword $MaxRevertingVMs $MaxRunningVMs $MaxExtraPoweredOnVms
- $SleepAfterRevert $AdminEMail $RobotEMail $WinePatchToOverride
- $WinePatchCc $SuiteTimeout
+ $VixGuestPassword $MaxRevertingVMs $MaxRunningVMs
+ $MaxExtraPoweredOnVms $SleepAfterRevert $WaitForToolsInVM
+ $AdminEMail $RobotEMail $WinePatchToOverride $WinePatchCc
+ $SuiteTimeout
$SingleTimeout $BuildTimeout $ReconfigTimeout $OverheadTimeout
$TagPrefix $ProjectName $PatchesMailingList $PatchResultsEMail
$LDAPServer $LDAPBindDN $LDAPSearchBase $LDAPSearchFilter
@@ -58,6 +59,7 @@ $MaxRevertingVMs = 1;
$MaxRunningVMs = 2;
$MaxExtraPoweredOnVms = 2;
$SleepAfterRevert = 30;
+$WaitForToolsInVM = 60;
$SuiteTimeout = 30 * 60;
$SingleTimeout = 2 * 60;
diff --git a/testbot/lib/WineTestBot/VMs.pm b/testbot/lib/WineTestBot/VMs.pm
index ef03889..98f99f7 100644
--- a/testbot/lib/WineTestBot/VMs.pm
+++ b/testbot/lib/WineTestBot/VMs.pm
@@ -351,7 +351,7 @@ sub WaitForToolsInGuest
return $ErrMessage;
}
- my $Err = VMWaitForToolsInGuest($VMHandle, 60);
+ my $Err = VMWaitForToolsInGuest($VMHandle, WaitForToolsInVM);
return $self->CheckError($Err);
}
More information about the wine-cvs
mailing list