From: Joe Guo Date: Wed, 4 Jul 2018 03:50:40 +0000 (+1200) Subject: tests/posixacl: rm duplicated test X-Git-Tag: tdb-1.3.16~14 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6875f4354a356ccdf11b8a08aa9e197e51a3c40f;p=thirdparty%2Fsamba.git tests/posixacl: rm duplicated test There are 2 copy of `test_setposixacl_getposixacl`, this patch removed the first copy, which was overwritten by the second one. They are 99% the same except in the last line a_perm is 6 vs 7, and 7 is the correct number. BUG: https://bugzilla.samba.org/show_bug.cgi?id=13521 Signed-off-by: Joe Guo Reviewed-by: Andrew Bartlett Reviewed-by: Gary Lockyer --- diff --git a/python/samba/tests/posixacl.py b/python/samba/tests/posixacl.py index 72059bc8f84..5c4cdad9d31 100644 --- a/python/samba/tests/posixacl.py +++ b/python/samba/tests/posixacl.py @@ -163,23 +163,6 @@ class PosixAclMappingTests(TestCaseInTempDir): self.assertEquals(facl.as_sddl(anysid),acl) posix_acl = smbd.get_sys_acl(self.tempf, smb_acl.SMB_ACL_TYPE_ACCESS) - def test_setposixacl_getposixacl(self): - smbd.set_simple_acl(self.tempf, 0o640) - posix_acl = smbd.get_sys_acl(self.tempf, smb_acl.SMB_ACL_TYPE_ACCESS) - self.assertEquals(posix_acl.count, 4, self.print_posix_acl(posix_acl)) - - self.assertEquals(posix_acl.acl[0].a_type, smb_acl.SMB_ACL_USER_OBJ) - self.assertEquals(posix_acl.acl[0].a_perm, 6) - - self.assertEquals(posix_acl.acl[1].a_type, smb_acl.SMB_ACL_GROUP_OBJ) - self.assertEquals(posix_acl.acl[1].a_perm, 4) - - self.assertEquals(posix_acl.acl[2].a_type, smb_acl.SMB_ACL_OTHER) - self.assertEquals(posix_acl.acl[2].a_perm, 0) - - self.assertEquals(posix_acl.acl[3].a_type, smb_acl.SMB_ACL_MASK) - self.assertEquals(posix_acl.acl[3].a_perm, 6) - def test_setposixacl_getntacl(self): smbd.set_simple_acl(self.tempf, 0o750) # We don't expect the xattr to be filled in in this case