]> git.ipfire.org Git - thirdparty/samba.git/commitdiff
tests: Allow to specify share names in smb2symlink tests
authorVolker Lendecke <vl@samba.org>
Wed, 1 Nov 2023 13:22:09 +0000 (14:22 +0100)
committerAndrew Bartlett <abartlet@samba.org>
Thu, 2 Nov 2023 19:14:37 +0000 (19:14 +0000)
Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
python/samba/tests/smb2symlink.py

index f501a549ec6155179ff05480bd536ef597223eae..81e75718f8220781dc879b1b9614c9b9e8d8ba55 100644 (file)
@@ -23,16 +23,17 @@ import samba.tests.libsmb
 
 class Smb2SymlinkTests(samba.tests.libsmb.LibsmbTests):
 
-    def connections(self):
-        share = samba.tests.env_get_var_value(
-            "SMB1_SHARE", allow_missing=True)
-        if not share:
-            share = "nosymlinks_smb1allow"
+    def connections(self, smb1share=None, smb2share=None):
+        if not smb1share:
+            smb1share = samba.tests.env_get_var_value(
+                "SMB1_SHARE", allow_missing=True)
+            if not smb1share:
+                smb1share = "nosymlinks_smb1allow"
 
         try:
             smb1 = libsmb.Conn(
                 self.server_ip,
-                share,
+                smb1share,
                 self.lp,
                 self.creds,
                 force_smb1=True)
@@ -41,13 +42,15 @@ class Smb2SymlinkTests(samba.tests.libsmb.LibsmbTests):
                 raise
         smb1.smb1_posix()
 
-        share = samba.tests.env_get_var_value(
-            "SMB2_SHARE", allow_missing=True)
-        if not share:
-            share = "nosymlinks"
+        if not smb2share:
+            smb2share = samba.tests.env_get_var_value(
+                "SMB2_SHARE", allow_missing=True)
+            if not smb2share:
+                smb2share = "nosymlinks"
+
         smb2 = libsmb.Conn(
             self.server_ip,
-            share,
+            smb2share,
             self.lp,
             self.creds)
         return (smb1, smb2)