1
0
mirror of https://github.com/samba-team/samba.git synced 2025-07-23 20:59:10 +03:00

Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-gmake4

(This used to be commit 0239011ced)
This commit is contained in:
Jelmer Vernooij
2008-04-14 23:30:17 +02:00
6 changed files with 14 additions and 17 deletions

View File

@ -23,8 +23,8 @@ from samba.tests import RpcInterfaceTestCase
class WinregTests(RpcInterfaceTestCase):
def setUp(self):
lp = self.get_loadparm()
self.conn = winreg.winreg("ncalrpc:", lp, self.get_credentials())
self.conn = winreg.winreg("ncalrpc:", self.get_loadparm(),
self.get_credentials())
def get_hklm(self):
return self.conn.OpenHKLM(None,

View File

@ -19,12 +19,11 @@
import echo
import unittest
from samba.tests import get_loadparm
from samba.tests import RpcInterfaceTestCase
class RpcEchoTests(unittest.TestCase):
class RpcEchoTests(RpcInterfaceTestCase):
def setUp(self):
lp_ctx = get_loadparm()
self.conn = echo.rpcecho("ncalrpc:", lp_ctx)
self.conn = echo.rpcecho("ncalrpc:", self.get_loadparm())
def test_addone(self):
self.assertEquals(2, self.conn.AddOne(1))

View File

@ -18,12 +18,11 @@
#
import samr
import unittest
from samba.tests import get_loadparm
from samba.tests import RpcInterfaceTestCase
class SamrTests(unittest.TestCase):
class SamrTests(RpcInterfaceTestCase):
def setUp(self):
self.conn = samr.samr("ncalrpc:", get_loadparm())
self.conn = samr.samr("ncalrpc:", self.get_loadparm())
def test_connect5(self):
(level, info, handle) = self.conn.Connect5(None, 0, 1, samr.ConnectInfo1())

View File

@ -18,12 +18,11 @@
#
import unixinfo
import unittest
from samba.tests import get_loadparm
from samba.tests import RpcInterfaceTestCase
class UnixinfoTests(unittest.TestCase):
class UnixinfoTests(RpcInterfaceTestCase):
def setUp(self):
self.conn = unixinfo.unixinfo("ncalrpc:", get_loadparm())
self.conn = unixinfo.unixinfo("ncalrpc:", self.get_loadparm())
def test_getpwuid(self):
infos = self.conn.GetPWUid(range(512))

View File

@ -24,7 +24,7 @@ from ldb import Dn
import param
import unittest
lp = samba.tests.get_loadparm()
lp = samba.tests.cmdline_loadparm
setup_dir = "setup"
def setup_path(file):

View File

@ -21,7 +21,7 @@ from credentials import Credentials
import os
from samba.provision import setup_samdb
from samba.samdb import SamDB
from samba.tests import get_loadparm, TestCaseInTempDir
from samba.tests import cmdline_loadparm, TestCaseInTempDir
import security
from unittest import TestCase
import uuid
@ -43,7 +43,7 @@ class SamDBTestCase(TestCaseInTempDir):
hostguid = uuid.random()
path = os.path.join(self.tempdir, "samdb.ldb")
self.samdb = setup_samdb(path, setup_path, system_session(), creds,
get_loadparm(), schemadn, configdn,
cmdline_loadparm, schemadn, configdn,
self.domaindn, "example.com", "EXAMPLE.COM",
"FOO", lambda x: None, "foo", domaindn,
False, domainsid, "# no aci", domainguid,