From 81fdcf95ae92a02f83501753dec0f29ddd555eeb Mon Sep 17 00:00:00 2001 From: Noel Power Date: Thu, 16 Jun 2022 17:17:45 +0100 Subject: s3/client: fix dfs deltree, resolve dfs path since 4cc4938a2866738aaff4dc91550bb7a5ad05d7fb do_list seems to deal with non dfs root path, hence we need to resolve the path before calling cli_unlink. Also remove the knownfail We additionally have to also remove the fallback to remove 'file3' int the smbcacls_dfs_propagate_inherit.teardown as the deltree that happens in the baseclass now succeeds. BUG: https://bugzilla.samba.org/show_bug.cgi?id=15100 Signed-off-by: Noel Power Reviewed-by: Jeremy Allison Autobuild-User(master): Jeremy Allison Autobuild-Date(master): Fri Jun 17 17:12:07 UTC 2022 on sn-devel-184 --- python/samba/tests/blackbox/smbcacls_dfs_propagate_inherit.py | 8 -------- 1 file changed, 8 deletions(-) (limited to 'python') diff --git a/python/samba/tests/blackbox/smbcacls_dfs_propagate_inherit.py b/python/samba/tests/blackbox/smbcacls_dfs_propagate_inherit.py index 36c29c8ccca..42680df0d06 100644 --- a/python/samba/tests/blackbox/smbcacls_dfs_propagate_inherit.py +++ b/python/samba/tests/blackbox/smbcacls_dfs_propagate_inherit.py @@ -85,11 +85,3 @@ class DfsInheritanceSmbCaclsTests(InheritanceSmbCaclsTests): def tearDown(self): super(DfsInheritanceSmbCaclsTests, self).tearDown() - # for dfs tests inevitably we fallback to remove the local files in - # the base class, the base class however doesn't know about the - # target dfs share (or its contents) so we have to assume we need to - # remove the file on the dfs share - smbclient_args = self.build_test_cmd("smbclient", ["//%s/%s" % (self.server, self.dfs_target_share), "-c", "rm file-3"]) - self.check_output(smbclient_args) - - -- cgit v1.2.3