Skip to content

Commit 03fb36b

Browse files
d-w-moorealanking
authored andcommitted
[#3] acls.set needs admin=True for some tests
Beginning with iRODS 4.3.1, we need to invoke modAccessControlInp_PI using an 'admin:' prefix in the accessLevel parameter in order for a rodsadmin to bump up their own permissions on an object, so some of the tests need to be updated accordingly.
1 parent 661456c commit 03fb36b

2 files changed

Lines changed: 3 additions & 3 deletions

File tree

irods/test/access_test.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,7 @@ def test_set_data_acl(self):
211211

212212
# reset permission to own
213213
acl1 = iRODSAccess('own', path, user.name, user.zone)
214-
self.sess.acls.set(acl1)
214+
self.sess.acls.set(acl1, admin = True)
215215

216216
# remove object
217217
self.sess.data_objects.unlink(path)
@@ -237,7 +237,7 @@ def test_set_collection_acl(self):
237237

238238
# reset permission to own
239239
acl1 = iRODSAccess('own', coll.path, user.name, user.zone)
240-
self.sess.acls.set(acl1)
240+
self.sess.acls.set(acl1, admin = True)
241241

242242
def perms_lists_symm_diff ( self, a_iter, b_iter ):
243243
fields = lambda perm: (self.mapping[perm.access_name], perm.user_name, perm.user_zone)

irods/test/login_auth_test.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -384,7 +384,7 @@ def setUp(self):
384384

385385
admin.collections.create(self.home)
386386
acl = iRODSAccess('own', self.home, user.name)
387-
admin.acls.set(acl)
387+
admin.acls.set(acl, admin = True)
388388

389389
self.env_file = os.path.expanduser('~/.irods.anon/irods_environment.json')
390390
self.env_dir = ( os.path.dirname(self.env_file))

0 commit comments

Comments
 (0)