@@ -1415,34 +1415,36 @@ def test_multifs_single_path_rootsquash(self):
14151415 self .fs1 = self .fs
14161416 self .fs2 = self .mds_cluster .newfs ('testcephfs2' )
14171417 self .mount_b .remount (cephfs_name = self .fs2 .name )
1418- self .captesters = (CapTester (self .mount_a ), CapTester (self .mount_b ))
1418+ self .captester1 = CapTester (self .mount_a )
1419+ self .captester2 = CapTester (self .mount_b )
14191420
1420- # Authorize client to fs1
14211421 PERM = 'rw'
14221422 FS_AUTH_CAPS = (('/' , PERM , 'root_squash' ),)
1423- self .captester = CapTester (self .mount_a , '/' )
1424- self .fs1 .authorize (self .client_id , FS_AUTH_CAPS )
14251423
1426- # Authorize client to fs2
1424+ self . fs1 . authorize ( self . client_id , FS_AUTH_CAPS )
14271425 self .fs2 .authorize (self .client_id , FS_AUTH_CAPS )
14281426 keyring = self .fs .mon_manager .get_keyring (self .client_id )
14291427
1430- self ._remount (self .mount_a , self .fs1 .name , keyring )
1431- self ._remount (self .mount_b , self .fs2 .name , keyring )
1428+ keyring_path = self .mount_a .client_remote .mktemp (data = keyring )
1429+ self .mount_a .remount (client_id = self .client_id ,
1430+ client_keyring_path = keyring_path )
14321431 # testing MDS caps...
14331432 # Since root_squash is set in client caps, client can read but not
14341433 # write even though access level is set to "rw" on both fses
1435- self .captester [0 ].conduct_pos_test_for_read_caps ()
1436- self .captester [0 ].conduct_pos_test_for_open_caps ()
1437- self .captester [0 ].conduct_neg_test_for_write_caps (sudo_write = True )
1438- self .captester [0 ].conduct_neg_test_for_chown_caps ()
1439- self .captester [0 ].conduct_neg_test_for_truncate_caps ()
1440-
1441- self .captester [1 ].conduct_pos_test_for_read_caps ()
1442- self .captester [1 ].conduct_pos_test_for_open_caps ()
1443- self .captester [1 ].conduct_neg_test_for_write_caps (sudo_write = True )
1444- self .captester [1 ].conduct_neg_test_for_chown_caps ()
1445- self .captester [1 ].conduct_neg_test_for_truncate_caps ()
1434+ self .captester1 .conduct_pos_test_for_read_caps ()
1435+ self .captester1 .conduct_pos_test_for_open_caps ()
1436+ self .captester1 .conduct_neg_test_for_write_caps (sudo_write = True )
1437+ self .captester1 .conduct_neg_test_for_chown_caps ()
1438+ self .captester1 .conduct_neg_test_for_truncate_caps ()
1439+
1440+ keyring_path = self .mount_b .client_remote .mktemp (data = keyring )
1441+ self .mount_b .remount (client_id = self .client_id ,
1442+ client_keyring_path = keyring_path )
1443+ self .captester2 .conduct_pos_test_for_read_caps ()
1444+ self .captester2 .conduct_pos_test_for_open_caps ()
1445+ self .captester2 .conduct_neg_test_for_write_caps (sudo_write = True )
1446+ self .captester2 .conduct_neg_test_for_chown_caps ()
1447+ self .captester2 .conduct_neg_test_for_truncate_caps ()
14461448
14471449 def test_single_path_rootsquash_issue_56067 (self ):
14481450 """
0 commit comments