On Fri, Feb 02, 2024 at 07:56:05PM +0800, Zorro Lang wrote:
> On Thu, Feb 01, 2024 at 05:17:32PM +0100, Anthony Iliopoulos wrote:
> > coreutils v9.4 introduced a change in the error output of mv under
> > certain errno values via commit 3cb862ce5f10 ("mv: better diagnostic for
> > 'mv dir x' failure"), which broke the golden output.
> >
> > Update golden output to match the change, and further add an output
> > filter to avoid having the test fail on environments that ran with an
> > older coreutils release, taken from commit d9323ad7a05e ("generic/245:
> > Filter mv error message").
> >
> > Signed-off-by: Anthony Iliopoulos <ailiop@xxxxxxxx>
> > ---
> > tests/generic/682 | 8 +++++++-
> > tests/generic/682.out | 2 +-
> > 2 files changed, 8 insertions(+), 2 deletions(-)
> >
> > diff --git a/tests/generic/682 b/tests/generic/682
> > index a51d18338742..417598804bde 100755
> > --- a/tests/generic/682
> > +++ b/tests/generic/682
> > @@ -54,6 +54,12 @@ repquota -upn $SCRATCH_MNT >> $seqres.full
> > echo $(ls $scratchdir | wc -l) files in $scratchdir >> $seqres.full
> > ls -sld $scratchdir >> $seqres.full
> >
> > +_filter_mv_output()
> > +{
> > + sed -e "s,cannot move .* to \(.*\):\(.*\),cannot overwrite \1:\2,g" \
>
> Hi Anthony,
>
> Thanks for this fix, I remember there's a mv filter in generic/245, we
> just merged a patch same with above line:
> d9323ad7a05e ("generic/245: Filter mv error message")
>
> I think you can merge the _filter_directory_not_empty() of g/245 with
> this patch into one _filter_mv_output() function, and call it in g/245
> and g/682 (check if there're more cases need mv output).
Make sense, I'll send out a v2 shortly with the filters consolidated.
AFAICT only g/245 and g/682 are affected by the particular coreutils mv
error output change, due to their golden output.
The only other tests are g/{369,419}:
$ git grep 'cannot move' tests/
tests/generic/369.out:mv: cannot move 'h' to 'd7/h': Permission denied
tests/generic/369.out:mv: cannot move 'h' to 's7/h': Permission denied
tests/generic/419.out:mv: cannot move 'SCRATCH_MNT/edir/NOKEY_NAME' to
'SCRATCH_MNT/edir/NOKEY_NAME': Required key not available
but those aren't affected as coreutils commit 3cb862ce5f10 only changed
the error output for specific err codes (EDQUOT, EEXIST, EISDIR, EMLINK,
ENOSPC, ENOTEMPTY, ETXTBSY), while g/369 is expecting EPERM and g/419 is
ENOKEY.
Regards,
Anthony
