From: David Mulder Date: Thu, 21 Jan 2021 19:11:09 +0000 (-0700) Subject: samba-tool: Test gpo manage symlink remove command X-Git-Tag: tevent-0.11.0~1970 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5794c670ff71c0189bd7caa3e75b21b6884d36b0;p=thirdparty%2Fsamba.git samba-tool: Test gpo manage symlink remove command Signed-off-by: David Mulder Reviewed-by: Jeremy Allison --- diff --git a/python/samba/netcmd/gpo.py b/python/samba/netcmd/gpo.py index 04e78fd5730..52ef041032f 100644 --- a/python/samba/netcmd/gpo.py +++ b/python/samba/netcmd/gpo.py @@ -2395,11 +2395,40 @@ samba-tool gpo manage symlink add {31B2F340-016D-11D2-945F-00C04FB984F9} /tmp/so "not have sufficient privileges") raise +class cmd_remove_symlink(Command): + """Removes a VGP Symbolic Link Group Policy from the sysvol + +This command removes a symlink setting from the sysvol from appling to winbind clients. + +Example: +samba-tool gpo manage symlink remove {31B2F340-016D-11D2-945F-00C04FB984F9} /tmp/source /tmp/target + """ + + synopsis = "%prog [options]" + + takes_optiongroups = { + "sambaopts": options.SambaOptions, + "versionopts": options.VersionOptions, + "credopts": options.CredentialsOptions, + } + + takes_options = [ + Option("-H", "--URL", help="LDB URL for database or target server", type=str, + metavar="URL", dest="H"), + ] + + takes_args = ["gpo", "source", "target"] + + def run(self, gpo, source, target, H=None, sambaopts=None, credopts=None, + versionopts=None): + pass + class cmd_symlink(SuperCommand): """Manage symlink Group Policy Objects""" subcommands = {} subcommands["list"] = cmd_list_symlink() subcommands["add"] = cmd_add_symlink() + subcommands["remove"] = cmd_remove_symlink() class cmd_manage(SuperCommand): """Manage Group Policy Objects""" diff --git a/python/samba/tests/samba_tool/gpo.py b/python/samba/tests/samba_tool/gpo.py index 4cc5c46d76c..910c56cec4f 100644 --- a/python/samba/tests/samba_tool/gpo.py +++ b/python/samba/tests/samba_tool/gpo.py @@ -840,6 +840,27 @@ class GpoCmdTestCase(SambaToolCmdTest): os.environ["PASSWORD"])) self.assertIn(symlink, out, 'The test entry was not found!') + (result, out, err) = self.runsublevelcmd("gpo", ("manage", + "symlink", "remove"), + self.gpo_guid, + source_text, target_text, + "-H", "ldap://%s" % + os.environ["SERVER"], + "-U%s%%%s" % + (os.environ["USERNAME"], + os.environ["PASSWORD"])) + self.assertCmdSuccess(result, out, err, 'Symlink remove failed') + + (result, out, err) = self.runsublevelcmd("gpo", ("manage", + "symlink", "list"), + self.gpo_guid, "-H", + "ldap://%s" % + os.environ["SERVER"], + "-U%s%%%s" % + (os.environ["USERNAME"], + os.environ["PASSWORD"])) + self.assertNotIn(symlink, out, 'The test entry was not removed!') + def setUp(self): """set up a temporary GPO to work with""" super(GpoCmdTestCase, self).setUp() diff --git a/selftest/knownfail.d/gpo b/selftest/knownfail.d/gpo new file mode 100644 index 00000000000..c73da923324 --- /dev/null +++ b/selftest/knownfail.d/gpo @@ -0,0 +1 @@ +^samba.tests.samba_tool.gpo.samba.tests.samba_tool.gpo.GpoCmdTestCase.test_symlink_add