diff mbox series

[v2,2/2] tests/nfs_filesystem: remove failing mount

Message ID 20240529140306.6663-2-stephen.smalley.work@gmail.com (mailing list archive)
State Superseded
Delegated to: Ondrej Mosnáček
Headers show
Series [v2,1/2] tools/nfs.sh: comment out the fscontext= tests for now | expand

Commit Message

Stephen Smalley May 29, 2024, 2:03 p.m. UTC
For reasons unclear, we attempt to mount twice, the 2nd time yields EBUSY,
and then the following test fails. Remove the 2nd mount, which also
resolves the failure.

Before:
Run NFS context specific tests
nfs_filesystem/test .. 2/56 creat(2) Failed: Permission denied

#   Failed test at nfs_filesystem/test line 118.
nfs_filesystem/test .. 30/56 creat(2) Failed: Permission denied

#   Failed test at nfs_filesystem/test line 118.
nfs_filesystem/test .. 53/56 # Looks like you failed 2 tests of 56.
nfs_filesystem/test .. Dubious, test returned 2 (wstat 512, 0x200)
Failed 2/56 subtests

Test Summary Report
-------------------
nfs_filesystem/test (Wstat: 512 (exited 2) Tests: 56 Failed: 2)
  Failed tests:  7, 35
  Non-zero exit status: 2
Files=1, Tests=56, 12 wallclock secs ( 0.02 usr  0.00 sys +  0.15 cusr  0.25 csys =  0.42 CPU)
Result: FAIL
Failed 1/1 test programs. 2/56 subtests failed.
Error on line: 104 - Closing down NFS
umount: /mnt/selinux-testsuite: not mounted.
NFS Closed down

After:
No errors from this test script.

Signed-off-by: Stephen Smalley <stephen.smalley.work@gmail.com>
---
 tests/nfs_filesystem/test | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)
diff mbox series

Patch

diff --git a/tests/nfs_filesystem/test b/tests/nfs_filesystem/test
index fc8d525..4203206 100755
--- a/tests/nfs_filesystem/test
+++ b/tests/nfs_filesystem/test
@@ -38,7 +38,7 @@  BEGIN {
         $v = " ";
     }
 
-    plan tests => 56;
+    plan tests => 54;
 }
 
 # Set for testing mount(2) on first run
@@ -100,17 +100,6 @@  while ( $i < 2 ) {
     );
     ok( $result eq 0, $test_msg );
 
-    # First mount(2) ok, second currently fails with EBUSY
-    $result = system(
-"runcon -t test_filesystem_t $mount_cmd $v -s $dev -t $target -f $fs_type -o $mount_opts 2>&1"
-    );
-    if ( $i eq 0 and $result >> 8 eq 16 ) {
-        ok( 1, "$test_msg - returned EBUSY, possible bug/feature" );
-    }
-    else {
-        ok( $result eq 0 );
-    }
-
     # Create file and change context via type_transition rule, check ok:
     $result = system(
 "runcon -t test_filesystem_t $filesystem_dir/create_file -f $target/tests/nfs_filesystem/mntpoint/mp1/test_file -e test_filesystem_filetranscon_t $v"