sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-08-02 00:22:11 +03:00
Code Activity

python/samba/tests/blackbox: Preparatory change to support custom share

Browse Source 
tearDown method doesn't handle local file deletion fallback if a share
other than 'tmp' is used

Signed-off-by: Noel Power <noel.power@suse.com>
Reviewed-by: Jeremy Allison <jra@samba.org>
This commit is contained in:
Noel Power
2020-07-27 16:51:12 +01:00
committed by Jeremy Allison
parent 8826d74ae8
commit c681f5bfe3
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
python/samba/tests/blackbox/smbcacls.py
View File

@ -37,6 +37,7 @@ class SmbCaclsBlockboxTestBase(BlackboxTestCase):
self.creds.set_password(self.passwd)
self.testdir = os.getenv("TESTDIR", "smbcacls")
self.share = os.getenv("SHARE", "tmp")
self.dirpath = os.path.join(os.environ["LOCAL_PATH"],self.testdir)
def tearDown(self):
try:
@ -50,11 +51,10 @@ class SmbCaclsBlockboxTestBase(BlackboxTestCase):
raise Exception("deltree: failed without setting errcode")
except Exception as e:
print("remote remove failed: %s" % str(e))
dirpath = os.path.join(os.environ["LOCAL_PATH"],self.testdir)
print("falling back to removing contents of local dir: %s" % dirpath)
if os.path.exists(dirpath):
for entry in os.listdir(dirpath):
fullpath = os.path.join(dirpath, entry)
print("falling back to removing contents of local dir: %s" % self.dirpath)
if os.path.exists(self.dirpath):
for entry in os.listdir(self.dirpath):
fullpath = os.path.join(self.dirpath, entry)
if os.path.isdir(fullpath):
import shutil
shutil.rmtree(fullpath)