sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-24 02:04:21 +03:00
Code

python: move clean_file() to samba/tests/libsmb.py

Browse Source 
BUG:https://bugzilla.samba.org/show_bug.cgi?id=15517

Signed-off-by: Ralph Boehme <slow@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
This commit is contained in:
Ralph Boehme 2023-11-09 19:52:55 +01:00 committed by Jeremy Allison
parent 29bb93d03a
commit f09c5a3dcb
2 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
python/samba/tests/libsmb.py
View File

@ -21,6 +21,7 @@ from samba.samba3 import libsmb_samba_internal as libsmb
from samba.dcerpc import security from samba.dcerpc import security
from samba.samba3 import param as s3param from samba.samba3 import param as s3param
from samba import credentials from samba import credentials
from samba import (ntstatus,NTSTATUSError)
import samba.tests import samba.tests
import os import os
@ -42,3 +43,13 @@ class LibsmbTests(samba.tests.TestCase):
self.global_inject = os.path.join(server_conf_dir, "global_inject.conf") self.global_inject = os.path.join(server_conf_dir, "global_inject.conf")
self.server_ip = samba.tests.env_get_var_value("SERVER_IP") self.server_ip = samba.tests.env_get_var_value("SERVER_IP")
def clean_file(self, conn, filename):
try:
conn.unlink(filename)
except NTSTATUSError as e:
if e.args[0] == ntstatus.NT_STATUS_FILE_IS_A_DIRECTORY:
conn.rmdir(filename)
elif not (e.args[0] == ntstatus.NT_STATUS_OBJECT_NAME_NOT_FOUND or
e.args[0] == ntstatus.NT_STATUS_OBJECT_PATH_NOT_FOUND):
raise

10
python/samba/tests/smb2symlink.py
View File

@ -55,16 +55,6 @@ class Smb2SymlinkTests(samba.tests.libsmb.LibsmbTests):
self.creds) self.creds)
return (smb1, smb2) return (smb1, smb2)
def clean_file(self, conn, filename):
try:
conn.unlink(filename)
except NTSTATUSError as e:
if e.args[0] == ntstatus.NT_STATUS_FILE_IS_A_DIRECTORY:
conn.rmdir(filename)
elif not (e.args[0] == ntstatus.NT_STATUS_OBJECT_NAME_NOT_FOUND or
e.args[0] == ntstatus.NT_STATUS_OBJECT_PATH_NOT_FOUND):
raise
def create_symlink(self, conn, target, symlink): def create_symlink(self, conn, target, symlink):
self.clean_file(conn, symlink) self.clean_file(conn, symlink)
if (conn.protocol() < libsmb.PROTOCOL_SMB2_02 and conn.have_posix()): if (conn.protocol() < libsmb.PROTOCOL_SMB2_02 and conn.have_posix()):