Francois Gouget : testbot/Engine: Remove the FoundWinetestUpdate() notification. It is redundent with RescheduleJobs().

[Alexandre Julliard]

Module: tools
Branch: master
Commit: 8f115fe2bd150ca3b96614e881b3fbf473d2aacb
URL:    http://source.winehq.org/git/tools.git/?a=commit;h=8f115fe2bd150ca3b96614e88...

Author: Francois Gouget 
Date:   Thu May 15 15:48:06 2014 +0200

testbot/Engine: Remove the FoundWinetestUpdate() notification. It is redundent with RescheduleJobs().

It did not use the $Bits parameter and just calls ScheduleJobs() which
is what the RescheduleJobs() notification does already.

---

testbot/bin/CheckForWinetestUpdate.pl    |    2 +-
 testbot/bin/Engine.pl                    |   20 --------------------
 testbot/lib/WineTestBot/Engine/Notify.pm |   19 +------------------
 3 files changed, 2 insertions(+), 39 deletions(-)

diff --git a/testbot/bin/CheckForWinetestUpdate.pl b/testbot/bin/CheckForWinetestUpdate.pl
index 6d33a5c..5d30913 100755
--- a/testbot/bin/CheckForWinetestUpdate.pl
+++ b/testbot/bin/CheckForWinetestUpdate.pl
@@ -251,7 +251,7 @@ else
   AddJob(1, $FileNameRandomPart, $Bits);
 }

-FoundWinetestUpdate($Bits);
+RescheduleJobs();

LogMsg "Submitted jobs\n";

diff --git a/testbot/bin/Engine.pl b/testbot/bin/Engine.pl
index 72e165c..f8b7e1e 100755
--- a/testbot/bin/Engine.pl
+++ b/testbot/bin/Engine.pl
@@ -425,25 +425,6 @@ sub HandleVMStatusChange
   return "1OK";
 }

-sub HandleFoundWinetestUpdate
-{
-  my $Bits = $_[0];
-
-  if ($Bits !~ /^(?:32|64)$/)
-  {
-    LogMsg "Invalid number of bits in foundwinetestupdate message\n";
-    return "0Invalid number of bits";
-  }
-
-  my $ErrMessage = ScheduleJobs();
-  if (defined($ErrMessage))
-  {
-    LogMsg "Scheduling problem in HandleFoundWinetestUpdate: $ErrMessage\n";
-  }
-
-  return "1OK";
-}
-
 sub HandleWinePatchMLSubmission
 {
   my $dh;
@@ -594,7 +575,6 @@ sub HandleGetScreenshot
 }

my %Handlers=(
-    "foundwinetestupdate"      => &HandleFoundWinetestUpdate,
     "getscreenshot"            => &HandleGetScreenshot,
     "jobcancel"                => &HandleJobCancel,
     "jobrestart"               => &HandleJobRestart,
diff --git a/testbot/lib/WineTestBot/Engine/Notify.pm b/testbot/lib/WineTestBot/Engine/Notify.pm
index 1f93db4..a241c81 100644
--- a/testbot/lib/WineTestBot/Engine/Notify.pm
+++ b/testbot/lib/WineTestBot/Engine/Notify.pm
@@ -34,7 +34,7 @@ use vars qw (@ISA @EXPORT @EXPORT_OK $RunningInEngine);
 require Exporter;
 @ISA = qw(Exporter);
 @EXPORT = qw(&Shutdown &PingEngine &JobSubmit &JobStatusChange &JobCancel
-             &JobRestart &RescheduleJobs &VMStatusChange &FoundWinetestUpdate
+             &JobRestart &RescheduleJobs &VMStatusChange
              &WinePatchMLSubmission &WinePatchWebSubmission &GetScreenshot);
 @EXPORT_OK = qw($RunningInEngine);

@@ -199,23 +199,6 @@ sub VMStatusChange
   return substr($Reply, 1);
 }

-sub FoundWinetestUpdate
-{
-  my $Bits = $_[0];
-
-  my $Reply = SendCmdReceiveReply("foundwinetestupdate $Bits\n");
-  if (length($Reply) < 1)
-  {
-    return "Unrecognized reply received from engine";
-  }
-  if (substr($Reply, 0, 1) eq "1")
-  {
-    return undef;
-  }
- 
-  return substr($Reply, 1);
-}
-
 sub WinePatchMLSubmission
 {
   my $Reply = SendCmdReceiveReply("winepatchmlsubmission\n");