diff mbox series

[v1] xfs/148: fix some errors for output

Message ID 20191204080423.27295-1-xifeng@redhat.com (mailing list archive)
State New, archived
Headers show
Series [v1] xfs/148: fix some errors for output | expand

Commit Message

XiaoLi Feng Dec. 4, 2019, 8:04 a.m. UTC
From: Xiaoli Feng <xifeng@redhat.com>

When disable crc, the extended attributes display is different for
"attr -l". And there is no quotes when ls no-exist file in RHEL7. eg.
RHEL7:
ls: cannot access file: No such file or directory
RHEL8:
ls: cannot access 'file': No such file or directory

Signed-off-by: Xiaoli Feng <xifeng@redhat.com>
---
 tests/xfs/148     |  2 +-
 tests/xfs/148.out | 17 +++++++++--------
 2 files changed, 10 insertions(+), 9 deletions(-)

Comments

Darrick J. Wong Dec. 4, 2019, 4:10 p.m. UTC | #1
On Wed, Dec 04, 2019 at 04:04:23PM +0800, XiaoLi Feng wrote:
> From: Xiaoli Feng <xifeng@redhat.com>
> 
> When disable crc, the extended attributes display is different for
> "attr -l". And there is no quotes when ls no-exist file in RHEL7. eg.
> RHEL7:
> ls: cannot access file: No such file or directory
> RHEL8:
> ls: cannot access 'file': No such file or directory
> 
> Signed-off-by: Xiaoli Feng <xifeng@redhat.com>
> ---
>  tests/xfs/148     |  2 +-
>  tests/xfs/148.out | 17 +++++++++--------
>  2 files changed, 10 insertions(+), 9 deletions(-)
> 
> diff --git a/tests/xfs/148 b/tests/xfs/148
> index 42cfdab0..1203edd9 100755
> --- a/tests/xfs/148
> +++ b/tests/xfs/148
> @@ -79,7 +79,7 @@ access_stuff() {
>  	$ATTR_PROG -l $testfile
>  
>  	for name in "${test_names[@]}"; do
> -		ls "$testdir/f_$name"
> +		ls "$testdir/f_$name" 2>&1 | sed -e "s/'//g"
>  		$ATTR_PROG -g "a_$name" $testfile
>  	done
>  }
> diff --git a/tests/xfs/148.out b/tests/xfs/148.out
> index c301ecb6..b1bea98a 100644
> --- a/tests/xfs/148.out
> +++ b/tests/xfs/148.out
> @@ -4,10 +4,11 @@ f_another
>  f_are_bad_for_you
>  f_something
>  f_too_many_beans
> -Attribute "a_something" has a 3 byte value for TEST_DIR/mount-148/testfile
> -Attribute "a_too_many_beans" has a 3 byte value for TEST_DIR/mount-148/testfile
>  Attribute "a_are_bad_for_you" has a 3 byte value for TEST_DIR/mount-148/testfile
> +Attribute "a_too_many_beans" has a 3 byte value for TEST_DIR/mount-148/testfile
>  Attribute "a_another" has a 3 byte value for TEST_DIR/mount-148/testfile
> +Attribute "a_something" has a 3 byte value for TEST_DIR/mount-148/testfile
> +Attribute "selinux" has a 37 byte value for TEST_DIR/mount-148/testfile

The single-quot filter part is fine, but this change in the golden
output doesn't reflect that...

--D

>  TEST_DIR/mount-148/testdir/f_something
>  Attribute "a_something" had a 3 byte value for TEST_DIR/mount-148/testfile:
>  heh
> @@ -20,10 +21,10 @@ heh
>  TEST_DIR/mount-148/testdir/f_another
>  Attribute "a_another" had a 3 byte value for TEST_DIR/mount-148/testfile:
>  heh
> -ls: cannot access 'TEST_DIR/mount-148/testdir/f_too_many': No such file or directory
> +ls: cannot access TEST_DIR/mount-148/testdir/f_too_many: No such file or directory
>  attr_get: No data available
>  Could not get "a_too_many" for TEST_DIR/mount-148/testfile
> -ls: cannot access 'TEST_DIR/mount-148/testdir/f_are_bad/for_you': No such file or directory
> +ls: cannot access TEST_DIR/mount-148/testdir/f_are_bad/for_you: No such file or directory
>  attr_get: No data available
>  Could not get "a_are_bad/for_you" for TEST_DIR/mount-148/testfile
>  ++ ACCESSING BAD METADATA
> @@ -33,18 +34,18 @@ attr_list: Structure needs cleaning
>  TEST_DIR/mount-148/testdir/f_something
>  Attribute "a_something" had a 3 byte value for TEST_DIR/mount-148/testfile:
>  heh
> -ls: cannot access 'TEST_DIR/mount-148/testdir/f_too_many_beans': No such file or directory
> +ls: cannot access TEST_DIR/mount-148/testdir/f_too_many_beans: No such file or directory
>  attr_get: No data available
>  Could not get "a_too_many_beans" for TEST_DIR/mount-148/testfile
> -ls: cannot access 'TEST_DIR/mount-148/testdir/f_are_bad_for_you': No such file or directory
> +ls: cannot access TEST_DIR/mount-148/testdir/f_are_bad_for_you: No such file or directory
>  attr_get: No data available
>  Could not get "a_are_bad_for_you" for TEST_DIR/mount-148/testfile
>  TEST_DIR/mount-148/testdir/f_another
>  Attribute "a_another" had a 3 byte value for TEST_DIR/mount-148/testfile:
>  heh
> -ls: cannot access 'TEST_DIR/mount-148/testdir/f_too_many': No such file or directory
> +ls: cannot access TEST_DIR/mount-148/testdir/f_too_many: No such file or directory
>  attr_get: No data available
>  Could not get "a_too_many" for TEST_DIR/mount-148/testfile
> -ls: cannot access 'TEST_DIR/mount-148/testdir/f_are_bad/for_you': No such file or directory
> +ls: cannot access TEST_DIR/mount-148/testdir/f_are_bad/for_you: No such file or directory
>  Attribute "a_are_bad/for_you" had a 3 byte value for TEST_DIR/mount-148/testfile:
>  heh
> -- 
> 2.18.1
>
XiaoLi Feng Dec. 6, 2019, 6:45 a.m. UTC | #2
Hi,

----- Original Message -----
> From: "Darrick J. Wong" <darrick.wong@oracle.com>
> To: "XiaoLi Feng" <xifeng@redhat.com>
> Cc: fstests@vger.kernel.org
> Sent: Thursday, December 5, 2019 12:10:53 AM
> Subject: Re: [PATCH v1] xfs/148: fix some errors for output
> 
> On Wed, Dec 04, 2019 at 04:04:23PM +0800, XiaoLi Feng wrote:
> > From: Xiaoli Feng <xifeng@redhat.com>
> > 
> > When disable crc, the extended attributes display is different for
> > "attr -l". And there is no quotes when ls no-exist file in RHEL7. eg.
> > RHEL7:
> > ls: cannot access file: No such file or directory
> > RHEL8:
> > ls: cannot access 'file': No such file or directory
> > 
> > Signed-off-by: Xiaoli Feng <xifeng@redhat.com>
> > ---
> >  tests/xfs/148     |  2 +-
> >  tests/xfs/148.out | 17 +++++++++--------
> >  2 files changed, 10 insertions(+), 9 deletions(-)
> > 
> > diff --git a/tests/xfs/148 b/tests/xfs/148
> > index 42cfdab0..1203edd9 100755
> > --- a/tests/xfs/148
> > +++ b/tests/xfs/148
> > @@ -79,7 +79,7 @@ access_stuff() {
> >  	$ATTR_PROG -l $testfile
> >  
> >  	for name in "${test_names[@]}"; do
> > -		ls "$testdir/f_$name"
> > +		ls "$testdir/f_$name" 2>&1 | sed -e "s/'//g"
> >  		$ATTR_PROG -g "a_$name" $testfile
> >  	done
> >  }
> > diff --git a/tests/xfs/148.out b/tests/xfs/148.out
> > index c301ecb6..b1bea98a 100644
> > --- a/tests/xfs/148.out
> > +++ b/tests/xfs/148.out
> > @@ -4,10 +4,11 @@ f_another
> >  f_are_bad_for_you
> >  f_something
> >  f_too_many_beans
> > -Attribute "a_something" has a 3 byte value for TEST_DIR/mount-148/testfile
> > -Attribute "a_too_many_beans" has a 3 byte value for
> > TEST_DIR/mount-148/testfile
> >  Attribute "a_are_bad_for_you" has a 3 byte value for
> >  TEST_DIR/mount-148/testfile
> > +Attribute "a_too_many_beans" has a 3 byte value for
> > TEST_DIR/mount-148/testfile
> >  Attribute "a_another" has a 3 byte value for TEST_DIR/mount-148/testfile
> > +Attribute "a_something" has a 3 byte value for TEST_DIR/mount-148/testfile
> > +Attribute "selinux" has a 37 byte value for TEST_DIR/mount-148/testfile
> 
> The single-quot filter part is fine, but this change in the golden
> output doesn't reflect that...
> 
> --D

Just found that you already sent a patch to fix "attr -l" output order. It's better.
And sorry, I didn't understand well about "but this change in the golden output doesn't
reflect that". I tested it on RHEL8, it's pass.

> 
> >  TEST_DIR/mount-148/testdir/f_something
> >  Attribute "a_something" had a 3 byte value for
> >  TEST_DIR/mount-148/testfile:
> >  heh
> > @@ -20,10 +21,10 @@ heh
> >  TEST_DIR/mount-148/testdir/f_another
> >  Attribute "a_another" had a 3 byte value for TEST_DIR/mount-148/testfile:
> >  heh
> > -ls: cannot access 'TEST_DIR/mount-148/testdir/f_too_many': No such file or
> > directory
> > +ls: cannot access TEST_DIR/mount-148/testdir/f_too_many: No such file or
> > directory
> >  attr_get: No data available
> >  Could not get "a_too_many" for TEST_DIR/mount-148/testfile
> > -ls: cannot access 'TEST_DIR/mount-148/testdir/f_are_bad/for_you': No such
> > file or directory
> > +ls: cannot access TEST_DIR/mount-148/testdir/f_are_bad/for_you: No such
> > file or directory
> >  attr_get: No data available
> >  Could not get "a_are_bad/for_you" for TEST_DIR/mount-148/testfile
> >  ++ ACCESSING BAD METADATA
> > @@ -33,18 +34,18 @@ attr_list: Structure needs cleaning
> >  TEST_DIR/mount-148/testdir/f_something
> >  Attribute "a_something" had a 3 byte value for
> >  TEST_DIR/mount-148/testfile:
> >  heh
> > -ls: cannot access 'TEST_DIR/mount-148/testdir/f_too_many_beans': No such
> > file or directory
> > +ls: cannot access TEST_DIR/mount-148/testdir/f_too_many_beans: No such
> > file or directory
> >  attr_get: No data available
> >  Could not get "a_too_many_beans" for TEST_DIR/mount-148/testfile
> > -ls: cannot access 'TEST_DIR/mount-148/testdir/f_are_bad_for_you': No such
> > file or directory
> > +ls: cannot access TEST_DIR/mount-148/testdir/f_are_bad_for_you: No such
> > file or directory
> >  attr_get: No data available
> >  Could not get "a_are_bad_for_you" for TEST_DIR/mount-148/testfile
> >  TEST_DIR/mount-148/testdir/f_another
> >  Attribute "a_another" had a 3 byte value for TEST_DIR/mount-148/testfile:
> >  heh
> > -ls: cannot access 'TEST_DIR/mount-148/testdir/f_too_many': No such file or
> > directory
> > +ls: cannot access TEST_DIR/mount-148/testdir/f_too_many: No such file or
> > directory
> >  attr_get: No data available
> >  Could not get "a_too_many" for TEST_DIR/mount-148/testfile
> > -ls: cannot access 'TEST_DIR/mount-148/testdir/f_are_bad/for_you': No such
> > file or directory
> > +ls: cannot access TEST_DIR/mount-148/testdir/f_are_bad/for_you: No such
> > file or directory
> >  Attribute "a_are_bad/for_you" had a 3 byte value for
> >  TEST_DIR/mount-148/testfile:
> >  heh
> > --
> > 2.18.1
> > 
> 
>
diff mbox series

Patch

diff --git a/tests/xfs/148 b/tests/xfs/148
index 42cfdab0..1203edd9 100755
--- a/tests/xfs/148
+++ b/tests/xfs/148
@@ -79,7 +79,7 @@  access_stuff() {
 	$ATTR_PROG -l $testfile
 
 	for name in "${test_names[@]}"; do
-		ls "$testdir/f_$name"
+		ls "$testdir/f_$name" 2>&1 | sed -e "s/'//g"
 		$ATTR_PROG -g "a_$name" $testfile
 	done
 }
diff --git a/tests/xfs/148.out b/tests/xfs/148.out
index c301ecb6..b1bea98a 100644
--- a/tests/xfs/148.out
+++ b/tests/xfs/148.out
@@ -4,10 +4,11 @@  f_another
 f_are_bad_for_you
 f_something
 f_too_many_beans
-Attribute "a_something" has a 3 byte value for TEST_DIR/mount-148/testfile
-Attribute "a_too_many_beans" has a 3 byte value for TEST_DIR/mount-148/testfile
 Attribute "a_are_bad_for_you" has a 3 byte value for TEST_DIR/mount-148/testfile
+Attribute "a_too_many_beans" has a 3 byte value for TEST_DIR/mount-148/testfile
 Attribute "a_another" has a 3 byte value for TEST_DIR/mount-148/testfile
+Attribute "a_something" has a 3 byte value for TEST_DIR/mount-148/testfile
+Attribute "selinux" has a 37 byte value for TEST_DIR/mount-148/testfile
 TEST_DIR/mount-148/testdir/f_something
 Attribute "a_something" had a 3 byte value for TEST_DIR/mount-148/testfile:
 heh
@@ -20,10 +21,10 @@  heh
 TEST_DIR/mount-148/testdir/f_another
 Attribute "a_another" had a 3 byte value for TEST_DIR/mount-148/testfile:
 heh
-ls: cannot access 'TEST_DIR/mount-148/testdir/f_too_many': No such file or directory
+ls: cannot access TEST_DIR/mount-148/testdir/f_too_many: No such file or directory
 attr_get: No data available
 Could not get "a_too_many" for TEST_DIR/mount-148/testfile
-ls: cannot access 'TEST_DIR/mount-148/testdir/f_are_bad/for_you': No such file or directory
+ls: cannot access TEST_DIR/mount-148/testdir/f_are_bad/for_you: No such file or directory
 attr_get: No data available
 Could not get "a_are_bad/for_you" for TEST_DIR/mount-148/testfile
 ++ ACCESSING BAD METADATA
@@ -33,18 +34,18 @@  attr_list: Structure needs cleaning
 TEST_DIR/mount-148/testdir/f_something
 Attribute "a_something" had a 3 byte value for TEST_DIR/mount-148/testfile:
 heh
-ls: cannot access 'TEST_DIR/mount-148/testdir/f_too_many_beans': No such file or directory
+ls: cannot access TEST_DIR/mount-148/testdir/f_too_many_beans: No such file or directory
 attr_get: No data available
 Could not get "a_too_many_beans" for TEST_DIR/mount-148/testfile
-ls: cannot access 'TEST_DIR/mount-148/testdir/f_are_bad_for_you': No such file or directory
+ls: cannot access TEST_DIR/mount-148/testdir/f_are_bad_for_you: No such file or directory
 attr_get: No data available
 Could not get "a_are_bad_for_you" for TEST_DIR/mount-148/testfile
 TEST_DIR/mount-148/testdir/f_another
 Attribute "a_another" had a 3 byte value for TEST_DIR/mount-148/testfile:
 heh
-ls: cannot access 'TEST_DIR/mount-148/testdir/f_too_many': No such file or directory
+ls: cannot access TEST_DIR/mount-148/testdir/f_too_many: No such file or directory
 attr_get: No data available
 Could not get "a_too_many" for TEST_DIR/mount-148/testfile
-ls: cannot access 'TEST_DIR/mount-148/testdir/f_are_bad/for_you': No such file or directory
+ls: cannot access TEST_DIR/mount-148/testdir/f_are_bad/for_you: No such file or directory
 Attribute "a_are_bad/for_you" had a 3 byte value for TEST_DIR/mount-148/testfile:
 heh