1
0
mirror of https://github.com/samba-team/samba.git synced 2025-07-30 19:42:05 +03:00

Use SMB_CONF_PATH environment variable inside tests rather than hardcoded paths.

(This used to be commit eb04de69c0)
This commit is contained in:
Jelmer Vernooij
2008-02-11 13:20:24 +01:00
parent e4165448d7
commit af007e5837
5 changed files with 13 additions and 8 deletions

View File

@ -84,3 +84,9 @@ class LdbExtensionTests(TestCaseInTempDir):
del l
os.unlink(path)
def get_loadparm():
import param
lp = param.LoadParm()
lp.load(os.getenv("SMB_CONF_PATH"))
return lp

View File

@ -20,11 +20,11 @@
import winreg
from param import LoadParm
import unittest
from samba.tests import get_loadparm
class WinregTests(unittest.TestCase):
def setUp(self):
lp_ctx = LoadParm()
lp_ctx.load("st/client/client.conf")
lp_ctx = get_loadparm()
self.conn = winreg.winreg("ncalrpc:", lp_ctx)
def get_hklm(self):

View File

@ -18,13 +18,12 @@
#
import echo
from param import LoadParm
import unittest
from samba.tests import get_loadparm
class RpcEchoTests(unittest.TestCase):
def setUp(self):
lp_ctx = LoadParm()
lp_ctx.load("st/client/client.conf")
lp_ctx = get_loadparm()
self.conn = echo.rpcecho("ncalrpc:", lp_ctx)
def test_addone(self):

View File

@ -19,10 +19,11 @@
import samr
import unittest
from samba.tests import get_loadparm
class SamrTests(unittest.TestCase):
def setUp(self):
self.conn = samr.samr("ncalrpc:", "st/client/client.conf")
self.conn = samr.samr("ncalrpc:", get_loadparm())
def test_connect5(self):
(level, info, handle) = self.conn.Connect5(None, 0, 1, samr.ConnectInfo1())

View File

@ -24,8 +24,7 @@ from ldb import Dn
import param
import unittest
lp = param.LoadParm()
lp.load("st/dc/etc/smb.conf")
lp = samba.tests.get_loadparm()
setup_dir = "setup"
def setup_path(file):