From: Christian Merten Date: Mon, 19 Sep 2022 21:28:07 +0000 (+0200) Subject: samba-tool dsacl: Add additional unit test for delete subcommand X-Git-Tag: talloc-2.4.0~794 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d89400b6201013ffdf06dc5480f59d9a41eb2f2a;p=thirdparty%2Fsamba.git samba-tool dsacl: Add additional unit test for delete subcommand Added one more unit test to the delete subcommand. This test adds two ACEs, deletes one of them and checks if the right one was deleted and the other one stayed the same. Signed-off-by: Christian Merten Reviewed-by: Douglas Bagnall Reviewed-by: Jeremy Allison Autobuild-User(master): Jeremy Allison Autobuild-Date(master): Tue Sep 27 17:46:22 UTC 2022 on sn-devel-184 --- diff --git a/python/samba/tests/samba_tool/dsacl.py b/python/samba/tests/samba_tool/dsacl.py index 29e3212613d..54aef5bd39a 100644 --- a/python/samba/tests/samba_tool/dsacl.py +++ b/python/samba/tests/samba_tool/dsacl.py @@ -161,6 +161,26 @@ class DSaclSetSddlTestCase(SambaToolCmdTest): self.assertEqual(acl_list_orig, acl_list_final_get, "output of dsacl get should be the same as after adding and deleting again") + def test_delete(self): + # add sddl_multi first + (result, out, err) = self.runsubcmd("dsacl", "set", + "--objectdn=%s" % self.dn, + "--sddl=%s" % self.sddl_multi) + + self.assertCmdSuccess(result, out, err) + self.assertEqual(err, "", "Shouldn't be any error messages") + # delete sddl + (result, out, err) = self.runsubcmd("dsacl", "delete", + "--objectdn=%s" % self.dn, + "--sddl=%s" % self.sddl) + self.assertCmdSuccess(result, out, err) + self.assertEqual(err, "", "Shouldn't be any error messages") + acl_list_deleted = re.findall('new descriptor for.*:\n(.*?)\n', out)[0] + + self.assertNotRegex(acl_list_deleted, re.escape(self.sddl)) + left_sddl = self.sddl_multi.replace(self.sddl, "") + self.assertRegex(acl_list_deleted, re.escape(left_sddl)) + def test_delete_twice(self): """Tests if deleting twice the same ACEs returns the expected warning.""" # add sddl_multi first