[_505] test local users both with and without zone

Author: d-w-moore

irods/test/access_test.py

@@ -499,17 +499,19 @@ def test_iRODSAccess_cannot_be_constructed_using_unsupported_type__issue_558(sel
 
     def test_atomic_acls_505(self):
         ses = self.sess
-        zone = user1 = user2 = group = None
+        zone = user1 = user2 = user3 = group = None
         try:
             zone = ses.zones.create("twilight","remote")
             user1 = ses.users.create("test_user_505", "rodsuser")
             user2 = ses.users.create("rod_serling_505#twilight", "rodsuser")
+            user3 = ses.users.create("local_test_user_505", "rodsuser")
             group = ses.groups.create("test_group_505")
             ses.acls._call_atomic_acl_api(
                 self.coll_path,
-                a1:=ACLOperation("write", user1.name,  user1.zone),
+                a1:=ACLOperation("write", user1.name, user1.zone),
                 a2:=ACLOperation("read", user2.name, user2.zone),
-                a3:=ACLOperation("read", group.name),
+                a3:=ACLOperation("read", user3.name, user3.zone),
+                a4:=ACLOperation("read", group.name),
             )
 
             normalize = lambda access: access.copy(decanonicalize=True, implied_zone=ses.zone)
@@ -520,12 +522,15 @@ def test_atomic_acls_505(self):
             self.assertIn(normalize(a1), accesses)
             self.assertIn(normalize(a2), accesses)
             self.assertIn(normalize(a3), accesses)
+            self.assertIn(normalize(a4), accesses)
 
         finally:
             if user1:
                 user1.remove()
             if user2:
                 user2.remove()
+            if user3:
+                user3.remove()
             if group:
                 group.remove()
             if zone: