From: Francois Gouget <fgouget@free.fr>
Subject: [Tools] testbot/TestAgent: Better report the netcat errors.
Message-Id: <E1auVyk-00071V-81@amboise>
Date: Mon, 25 Apr 2016 04:10:26 +0200 (CEST)

Signed-off-by: Francois Gouget <fgouget@free.fr>
---
 testbot/lib/WineTestBot/TestAgent.pm | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/testbot/lib/WineTestBot/TestAgent.pm b/testbot/lib/WineTestBot/TestAgent.pm
index 82ca97f..da10672 100644
--- a/testbot/lib/WineTestBot/TestAgent.pm
+++ b/testbot/lib/WineTestBot/TestAgent.pm
@@ -220,7 +220,16 @@ sub _SetError($$$)
           };
           $ncerr = $rc if (!$ncerr);
           $ncerr = "the \"$self->{nc}\" command returned $ncerr";
-          $self->{err} = $self->{agentversion} ? "$self->{err}\n$ncerr" : $ncerr;
+          if ($self->{agentversion})
+          {
+            $self->{err} .= "\n$ncerr";
+          }
+          else
+          {
+            # The real issue is that we failed to connect so
+            # ignore the _RecvString('AgentVersion') error message
+            $self->{err} = "$ncerr ($self->{rpc})";
+          }
         }
       }
       $self->Disconnect();
@@ -231,7 +240,7 @@ sub _SetError($$$)
     # We did not even manage to connect but record the error anyway
     $self->{err} = $Msg;
   }
-  debug($self->{rpc} || "norpc", ": $self->{err}\n");
+  debug("$self->{err}\n");
 }
 
 sub GetLastError($)

-- 
2.8.0.rc3