Francois Gouget : testbot/TestAgent: Improve TestAgent' s RPC diagnostic messages.

[Alexandre Julliard]

Module: tools
Branch: master
Commit: 2e1f2a07914b55351b2a54522c373c3c50817369
URL:    http://source.winehq.org/git/tools.git/?a=commit;h=2e1f2a07914b55351b2a54522...

Author: Francois Gouget <fgouget(a)free.fr>
Date:   Mon Mar 14 00:10:26 2016 +0100

testbot/TestAgent: Improve TestAgent's RPC diagnostic messages.

If an error occurred while reconnecting for an RPC, the RPC name would
not be mentioned in the error message.

Signed-off-by: Francois Gouget <fgouget(a)free.fr>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>

---

 testbot/lib/WineTestBot/TestAgent.pm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/testbot/lib/WineTestBot/TestAgent.pm b/testbot/lib/WineTestBot/TestAgent.pm
index 9d372ad..38c2184 100644
--- a/testbot/lib/WineTestBot/TestAgent.pm
+++ b/testbot/lib/WineTestBot/TestAgent.pm
@@ -860,7 +860,7 @@ sub _Connect($)
   my ($self) = @_;
 
   my $OldRPC = $self->{rpc};
-  $self->{rpc} = "Connect";
+  $self->{rpc} = ($self->{rpc} ? "$self->{rpc}/" : "") ."connect";
 
   my $Step;
   foreach my $Dummy (1..$self->{cattempts})
@@ -967,7 +967,7 @@ sub _Connect($)
         if (!$self->{fd}->exec($self->{nc}))
         {
           alarm(0);
-          $self->_SetError($FATAL, "Unable to start netcat: " . $self->_ssherror());
+          $self->_SetError($FATAL, "Unable to start netcat ($self->{rpc}): " . $self->_ssherror());
           return; # out of eval
         }
       }