sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-10 01:18:15 +03:00
Code

KCC move and fix ldif_import_export and graph_utils tests

Browse Source 
Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Garming Sam <garming@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
This commit is contained in:
Douglas Bagnall 2015-04-30 14:33:30 +12:00 committed by Andrew Bartlett
parent e6991d2a07
commit 6328b100a3
3 changed files with 19 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
python/samba/tests/kcc/graph_utils.py
View File

@ -1,4 +1,4 @@
# Unix SMB/CIFS implementation. Tests for graph_utils.py routines # Unix SMB/CIFS implementation. Tests for kcc.graph_utils routines
# Copyright (C) Andrew Bartlett 2015 # Copyright (C) Andrew Bartlett 2015
# #
# Written by Douglas Bagnall <douglas.bagnall@catalyst.net.nz> # Written by Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
@ -17,11 +17,11 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>. # along with this program. If not, see <http://www.gnu.org/licenses/>.
# #
"""Tests for samba.graph_utils""" """Tests for samba.kcc.graph_utils"""
import samba import samba
import samba.tests import samba.tests
from samba.graph_utils import * from samba.kcc.graph_utils import *
import itertools import itertools

38
python/samba/tests/kcc/ldif_import_export.py
View File

@ -23,9 +23,10 @@ import samba
import os import os
from tempfile import mkdtemp from tempfile import mkdtemp
import time import time
import shutil
import samba.tests import samba.tests
from samba.kcc import ldif_import_export from samba.kcc import ldif_import_export, KCC
from samba import ldb from samba import ldb
from samba.dcerpc import misc from samba.dcerpc import misc
@ -82,7 +83,8 @@ class LdifUtilTests(samba.tests.TestCase):
def test_ldif_to_samdb(self): def test_ldif_to_samdb(self):
dburl = os.path.join(self.tmpdir, "ldap") dburl = os.path.join(self.tmpdir, "ldap")
samdb = ldif_utils.ldif_to_samdb(dburl, self.lp, MULTISITE_LDIF) samdb = ldif_import_export.ldif_to_samdb(dburl, self.lp,
MULTISITE_LDIF)
self.assertIsInstance(samdb, SamDB) self.assertIsInstance(samdb, SamDB)
dsa = ("CN=WIN01,CN=Servers,CN=Default-First-Site-Name,CN=Sites," dsa = ("CN=WIN01,CN=Servers,CN=Default-First-Site-Name,CN=Sites,"
@ -104,8 +106,9 @@ class LdifUtilTests(samba.tests.TestCase):
for dsa, site in MULTISITE_LDIF_DSAS: for dsa, site in MULTISITE_LDIF_DSAS:
dburl = os.path.join(self.tmpdir, "ldif-to-samba-forced-local-dsa" dburl = os.path.join(self.tmpdir, "ldif-to-samba-forced-local-dsa"
"-%s" % dsa) "-%s" % dsa)
samdb = ldif_utils.ldif_to_samdb(dburl, self.lp, MULTISITE_LDIF, samdb = ldif_import_export.ldif_to_samdb(dburl, self.lp,
forced_local_dsa=dsa) MULTISITE_LDIF,
forced_local_dsa=dsa)
self.assertIsInstance(samdb, SamDB) self.assertIsInstance(samdb, SamDB)
self.assertEqual(samdb.server_site_name(), site) self.assertEqual(samdb.server_site_name(), site)
@ -142,39 +145,26 @@ class KCCMultisiteLdifTests(samba.tests.TestCase):
def _get_kcc(self, name, readonly=False, verify=False, dot_file_dir=None): def _get_kcc(self, name, readonly=False, verify=False, dot_file_dir=None):
# Note that setting read-only to False won't affect the ldif, # Note that setting read-only to False won't affect the ldif,
# only the temporary database that is created from it. # only the temporary database that is created from it.
my_kcc = kcc.KCC(unix_now, readonly=readonly, verify=verify, my_kcc = KCC(unix_now, readonly=readonly, verify=verify,
dot_file_dir=dot_file_dir) dot_file_dir=dot_file_dir)
tmpdb = os.path.join(self.tmpdir, 'tmpdb') tmpdb = os.path.join(self.tmpdir, 'tmpdb')
my_kcc.import_ldif(tmpdb, self.lp, self.creds, MULTISITE_LDIF) my_kcc.import_ldif(tmpdb, self.lp, self.creds, MULTISITE_LDIF)
return my_kcc return my_kcc
def test_list_dsas(self): def test_list_dsas(self):
my_kcc = _get_kcc('test-list') my_kcc = self._get_kcc('test-list')
dsas = set(my_kcc.list_dsas()) dsas = set(my_kcc.list_dsas())
expected_dsas = set(x[0] for x in MULTISITE_LDIF_DSAS) expected_dsas = set(x[0] for x in MULTISITE_LDIF_DSAS)
self.assertEqual(dsas, expected_dsas) self.assertEqual(dsas, expected_dsas)
env = os.environ['TEST_ENV']
for expected_dsa in ENV_DSAS[env]:
self.assertIn(expected_dsa, dsas)
def test_verify(self): def test_verify(self):
"""Check that the KCC generates graphs that pass its own verify """Check that the KCC generates graphs that pass its own verify
option. option.
""" """
my_kcc = _get_kcc('test-list') my_kcc = self._get_kcc('test-list', verify=True)
tmpdb = os.path.join(self.tmpdir, 'verify-tmpdb')
my_kcc.import_ldif(tmpdb, self.lp, self.creds, MULTISITE_LDIF)
self.kcc = kcc.KCC(unix_now, readonly=False, ver) my_kcc.run("ldap://%s" % tmpdb,
self.kcc.import_ldif(self.tmpdb, self.lp, self.creds, MULTISITE_LDIF)
if opts.tmpdb is None or opts.tmpdb.startswith('ldap'):
if opts.tmpdb is None or opts.tmpdb.startswith('ldap'):
my_kcc = kcc.KCC(unix_now, readonly=True, verify=True,
debug=False, dot_file_dir=None)
my_kcc.run("ldap://%s" % os.environ["SERVER"],
self.lp, self.creds, self.lp, self.creds,
attempt_live_connections=False) attempt_live_connections=False)

4
selftest/tests.py
View File

@ -96,6 +96,6 @@ planpythontestsuite("none", "samba.tests.upgradeprovision")
planpythontestsuite("none", "samba.tests.xattr") planpythontestsuite("none", "samba.tests.xattr")
planpythontestsuite("none", "samba.tests.ntacls") planpythontestsuite("none", "samba.tests.ntacls")
planpythontestsuite("none", "samba.tests.policy") planpythontestsuite("none", "samba.tests.policy")
planpythontestsuite("none", "samba.tests.graph_utils") planpythontestsuite("none", "samba.tests.kcc.graph_utils")
planpythontestsuite("none", "samba.tests.ldif_utils") planpythontestsuite("none", "samba.tests.kcc.ldif_import_export")
plantestsuite("wafsamba.duplicate_symbols", "none", [os.path.join(srcdir(), "buildtools/wafsamba/test_duplicate_symbol.sh")]) plantestsuite("wafsamba.duplicate_symbols", "none", [os.path.join(srcdir(), "buildtools/wafsamba/test_duplicate_symbol.sh")])