Francois Gouget : testbot/TestAgent: Better indicate the file transfer position/range in case of errors.

[Alexandre Julliard]

Module: tools
Branch: master
Commit: 2630f459dd8db55664b0a6b38c5640ff37ec901d
URL:    http://source.winehq.org/git/tools.git/?a=commit;h=2630f459dd8db55664b0a6b38...

Author: Francois Gouget <fgouget(a)free.fr>
Date:   Mon Apr 11 02:46:52 2016 +0200

testbot/TestAgent: Better indicate the file transfer position/range in case of errors.

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

---

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

diff --git a/testbot/lib/WineTestBot/TestAgent.pm b/testbot/lib/WineTestBot/TestAgent.pm
index 74e7395..82ca97f 100644
--- a/testbot/lib/WineTestBot/TestAgent.pm
+++ b/testbot/lib/WineTestBot/TestAgent.pm
@@ -486,7 +486,7 @@ sub _RecvFile($$$$)
       if (!defined $r)
       {
         alarm(0);
-        $self->_SetError($FATAL, "got a network error while receiving '$Filename' ($self->{rpc}:$Name:$Pos/$Size): $!");
+        $self->_SetError($FATAL, "got a network error while receiving '$Filename' ($self->{rpc}:$Name:$Pos+$s/$Size): $!");
         return; # out of eval
       }
       if ($r == 0)
@@ -501,7 +501,7 @@ sub _RecvFile($$$$)
       if (!defined $w or $w != $r)
       {
         alarm(0);
-        $self->_SetError($ERROR, "an error occurred while writing to '$Filename' ($self->{rpc}:$Name:$Pos/$Size): $!");
+        $self->_SetError($ERROR, "an error occurred while writing to '$Filename' ($self->{rpc}:$Name:$Pos+$r/$Size): $!");
         $self->_SkipRawData($Name, $Remaining);
         return; # out of eval
       }
@@ -806,7 +806,7 @@ sub _SendFile($$$$)
       if (!defined $r)
       {
         alarm(0);
-        $self->_SetError($FATAL, "an error occurred while reading from '$Filename' ($self->{rpc}:$Name:$Pos/$Size): $!");
+        $self->_SetError($FATAL, "an error occurred while reading from '$Filename' ($self->{rpc}:$Name:$Pos+$s/$Size): $!");
         return; # out of eval
       }
       if ($r == 0)
@@ -821,7 +821,8 @@ sub _SendFile($$$$)
       if (!defined $w or $w != $r)
       {
         alarm(0);
-        $self->_SetError($FATAL, "got a network error while sending '$Filename' ($self->{rpc}:$Name:$Pos+$s/$Size): $!");
+        # Overwrite _Write()'s error message with a more appropriate one
+        $self->_SetError($FATAL, "got a network error while sending '$Filename' ($self->{rpc}:$Name:$Pos+$r/$Size): $!");
         return; # out of eval
       }
     }