s4-test: Use smb.conf path set in environment rather than using

command-line options.

This is the first step towards supporting custom test runners.

1 files changed, 10 insertions, 3 deletions

diff --git a/source4/scripting/python/samba/tests/__init__.py b/source4/scripting/python/samba/tests/__init__.py
index ae7a707e35f..a5459f44b51 100644
--- a/source4/scripting/python/samba/tests/__init__.py
+++ b/source4/scripting/python/samba/tests/__init__.py
@@ -22,6 +22,7 @@
 import os
 import ldb
 import samba
+from samba import param
 import tempfile
 import unittest
 
@@ -90,14 +91,20 @@ class LdbExtensionTests(TestCaseInTempDir):
             os.unlink(path)
 
 
-cmdline_loadparm = None
+def env_loadparm():
+    lp = param.LoadParm()
+    try:
+        lp.load(os.environ["SMB_CONF_PATH"])
+    except KeyError:
+        raise Exception("SMB_CONF_PATH not set")
+    return lp
+
 cmdline_credentials = None
 
 class RpcInterfaceTestCase(unittest.TestCase):
 
     def get_loadparm(self):
-        assert cmdline_loadparm is not None
-        return cmdline_loadparm
+        return env_loadparm()
 
     def get_credentials(self):
         return cmdline_credentials