From fec5a569b6be94ee7fcc2608be9ce7dbd2976871 Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Tue, 17 Nov 2020 16:11:11 +0100 Subject: [PATCH] tests: Factor out prep_creds() 3 times the same code can be put together Signed-off-by: Volker Lendecke Reviewed-by: Jeremy Allison --- python/samba/tests/libsmb.py | 24 ++++++++---------------- 1 file changed, 8 insertions(+), 16 deletions(-) diff --git a/python/samba/tests/libsmb.py b/python/samba/tests/libsmb.py index 81d4e482644..0f0d27c9b32 100644 --- a/python/samba/tests/libsmb.py +++ b/python/samba/tests/libsmb.py @@ -51,8 +51,7 @@ class LibsmbTestCase(samba.tests.TestCase): except Exception: self.exc = sys.exc_info() - def test_OpenClose(self): - + def prep_creds(self): lp = s3param.get_context() lp.load(os.getenv("SMB_CONF_PATH")) @@ -61,6 +60,11 @@ class LibsmbTestCase(samba.tests.TestCase): creds.set_username(os.getenv("USERNAME")) creds.set_password(os.getenv("PASSWORD")) + return (lp,creds) + + def test_OpenClose(self): + (lp,creds) = self.prep_creds() + c = libsmb.Conn(os.getenv("SERVER_IP"), "tmp", lp, creds, multi_threaded=True, force_smb1=True) @@ -82,13 +86,7 @@ class LibsmbTestCase(samba.tests.TestCase): def test_SMB3EncryptionRequired(self): test_dir = 'testing_%d' % random.randint(0, 0xFFFF) - lp = s3param.get_context() - lp.load(os.getenv("SMB_CONF_PATH")) - - creds = credentials.Credentials() - creds.guess(lp) - creds.set_username(os.getenv("USERNAME")) - creds.set_password(os.getenv("PASSWORD")) + (lp,creds) = self.prep_creds() creds.set_smb_encryption(SMB_ENCRYPTION_REQUIRED) c = libsmb.Conn(os.getenv("SERVER_IP"), "tmp", @@ -100,13 +98,7 @@ class LibsmbTestCase(samba.tests.TestCase): def test_SMB1EncryptionRequired(self): test_dir = 'testing_%d' % random.randint(0, 0xFFFF) - lp = s3param.get_context() - lp.load(os.getenv("SMB_CONF_PATH")) - - creds = credentials.Credentials() - creds.guess(lp) - creds.set_username(os.getenv("USERNAME")) - creds.set_password(os.getenv("PASSWORD")) + (lp,creds) = self.prep_creds() creds.set_smb_encryption(SMB_ENCRYPTION_REQUIRED) c = libsmb.Conn(os.getenv("SERVER_IP"), "tmp", -- 2.47.3