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

[Francois Gouget]

Should I resend or change this patch?

On Mon, 11 Apr 2016, Francois Gouget wrote:

> Signed-off-by: Francois Gouget <fgouget at free.fr>
> ---
>  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
>        }
>      }
> -- 
> 2.8.0.rc3
> 
> 
> 


-- 
Francois Gouget <fgouget at free.fr>              http://fgouget.free.fr/
                Linux: It is now safe to turn on your computer.