The branch, master has been updated via f70d0ac Tests: remove redondent testsuites in provision via 95fc53a Tests: avoid adding python options that are functions in the env via e1ab7b6 Tests: rewrite ldap_schema to specify attributes from 853360b Fix warnings with mismatched sizes in arguments to DEBUG statements.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit f70d0ac7390fdd0f305f0ee1133fd9611ca3333a Author: Matthieu Patou <m...@matws.net> Date: Thu Jan 3 14:34:31 2013 -0800 Tests: remove redondent testsuites in provision Removed provision are already tested somewhere else. Signed-off-by: Matthieu Patou <m...@matws.net> Reviewed-by: Andrew Bartlett <abart...@samba.org> Autobuild-User(master): Matthieu Patou <m...@samba.org> Autobuild-Date(master): Mon Jan 21 09:59:43 CET 2013 on sn-devel-104 commit 95fc53a37b9c75cbc1d13432887de095ff779a1e Author: Matthieu Patou <m...@matws.net> Date: Thu Jan 3 14:34:13 2013 -0800 Tests: avoid adding python options that are functions in the env This fix errors when running test --testenv --screen Signed-off-by: Matthieu Patou <m...@matws.net> Reviewed-by: Andrew Bartlett <abart...@samba.org> commit e1ab7b68043c1f459541838c2b839bc7cb117c19 Author: Matthieu Patou <m...@matws.net> Date: Tue Jan 1 13:40:44 2013 -0800 Tests: rewrite ldap_schema to specify attributes Signed-off-by: Matthieu Patou <m...@matws.net> Reviewed-by: Andrew Bartlett <abart...@samba.org> ----------------------------------------------------------------------- Summary of changes: selftest/wscript | 7 ++++- source4/dsdb/tests/python/ldap_schema.py | 39 +++++++++++++++++----------- source4/setup/tests/blackbox_provision.sh | 7 +---- 3 files changed, 31 insertions(+), 22 deletions(-) Changeset truncated at 500 lines: diff --git a/selftest/wscript b/selftest/wscript index 4733dc1..c7637a1 100644 --- a/selftest/wscript +++ b/selftest/wscript @@ -6,6 +6,7 @@ import Scripting, os, Options, Utils, Environment, optparse, sys from samba_utils import * from samba_autoconf import * +import types def set_options(opt): @@ -114,7 +115,11 @@ def cmd_testonly(opt): # put all command line options in the environment as TESTENV_*=* for o in dir(Options.options): if o[0:1] != '_': - os.environ['TESTENV_%s' % o.upper()] = str(getattr(Options.options, o, '')) + val = getattr(Options.options, o, '') + if not issubclass(type(val), types.FunctionType) \ + and not issubclass(type(val), types.MethodType): + os.environ['TESTENV_%s' % o.upper()] = str(getattr(Options.options, o, '')) + binary_mapping = ('nmblookup3:nmblookup,' + 'nmblookup4:nmblookup4,' + diff --git a/source4/dsdb/tests/python/ldap_schema.py b/source4/dsdb/tests/python/ldap_schema.py index d77f553..fb0ef9c 100755 --- a/source4/dsdb/tests/python/ldap_schema.py +++ b/source4/dsdb/tests/python/ldap_schema.py @@ -67,8 +67,9 @@ class SchemaTests(samba.tests.TestCase): def test_generated_schema_is_operational(self): """Testing we don't get the generated schema via LDAP by default""" + # Must keep the "*" form res = self.ldb.search("cn=aggregate,"+self.schema_dn, scope=SCOPE_BASE, - attrs=["*"]) + attrs=["*"]) self.assertEquals(len(res), 1) self.assertFalse("dITContentRules" in res[0]) self.assertFalse("objectClasses" in res[0]) @@ -106,7 +107,8 @@ schemaUpdateNow: 1 # Search for created attribute res = [] - res = self.ldb.search("cn=%s,%s" % (attr_name, self.schema_dn), scope=SCOPE_BASE, attrs=["*"]) + res = self.ldb.search("cn=%s,%s" % (attr_name, self.schema_dn), scope=SCOPE_BASE, + attrs=["lDAPDisplayName","schemaIDGUID"]) self.assertEquals(len(res), 1) self.assertEquals(res[0]["lDAPDisplayName"][0], attr_ldap_display_name) self.assertTrue("schemaIDGUID" in res[0]) @@ -160,7 +162,8 @@ systemOnly: FALSE # Search for created objectclass res = [] - res = self.ldb.search("cn=%s,%s" % (class_name, self.schema_dn), scope=SCOPE_BASE, attrs=["*"]) + res = self.ldb.search("cn=%s,%s" % (class_name, self.schema_dn), scope=SCOPE_BASE, + attrs=["lDAPDisplayName", "defaultObjectCategory", "schemaIDGUID", "distinguishedName"]) self.assertEquals(len(res), 1) self.assertEquals(res[0]["lDAPDisplayName"][0], class_ldap_display_name) self.assertEquals(res[0]["defaultObjectCategory"][0], res[0]["distinguishedName"][0]) @@ -193,7 +196,7 @@ name: """ + object_name + """ # Search for created object res = [] - res = self.ldb.search("cn=%s,cn=Users,%s" % (object_name, self.base_dn), scope=SCOPE_BASE, attrs=["*"]) + res = self.ldb.search("cn=%s,cn=Users,%s" % (object_name, self.base_dn), scope=SCOPE_BASE, attrs=["dn"]) self.assertEquals(len(res), 1) # Delete the object delete_force(self.ldb, "cn=%s,cn=Users,%s" % (object_name, self.base_dn)) @@ -223,7 +226,9 @@ systemOnly: FALSE # Search for created objectclass res = [] - res = self.ldb.search("cn=%s,%s" % (class_name, self.schema_dn), scope=SCOPE_BASE, attrs=["*"]) + res = self.ldb.search("cn=%s,%s" % (class_name, self.schema_dn), scope=SCOPE_BASE, + attrs=["lDAPDisplayName", "defaultObjectCategory", + "schemaIDGUID", "distinguishedName"]) self.assertEquals(len(res), 1) self.assertEquals(res[0]["lDAPDisplayName"][0], class_ldap_display_name) self.assertEquals(res[0]["defaultObjectCategory"][0], res[0]["distinguishedName"][0]) @@ -249,7 +254,7 @@ instanceType: 4 # Search for created object res = [] - res = self.ldb.search("ou=%s,%s" % (object_name, self.base_dn), scope=SCOPE_BASE, attrs=["*"]) + res = self.ldb.search("ou=%s,%s" % (object_name, self.base_dn), scope=SCOPE_BASE, attrs=["dn"]) self.assertEquals(len(res), 1) # Delete the object delete_force(self.ldb, "ou=%s,%s" % (object_name, self.base_dn)) @@ -260,7 +265,9 @@ class SchemaTests_msDS_IntId(samba.tests.TestCase): def setUp(self): super(SchemaTests_msDS_IntId, self).setUp() self.ldb = ldb - res = ldb.search(base="", expression="", scope=SCOPE_BASE, attrs=["*"]) + res = ldb.search(base="", expression="", scope=SCOPE_BASE, + attrs=["schemaNamingContext", "defaultNamingContext", + "forestFunctionality"]) self.assertEquals(len(res), 1) self.schema_dn = res[0]["schemaNamingContext"][0] self.base_dn = res[0]["defaultNamingContext"][0] @@ -339,7 +346,8 @@ systemOnly: FALSE # Search for created attribute res = [] - res = self.ldb.search(attr_dn, scope=SCOPE_BASE, attrs=["*"]) + res = self.ldb.search(attr_dn, scope=SCOPE_BASE, + attrs=["lDAPDisplayName", "msDS-IntId", "systemFlags"]) self.assertEquals(len(res), 1) self.assertEquals(res[0]["lDAPDisplayName"][0], attr_ldap_name) if self.forest_level >= DS_DOMAIN_FUNCTION_2003: @@ -381,7 +389,8 @@ systemOnly: FALSE # Search for created attribute res = [] - res = self.ldb.search(attr_dn, scope=SCOPE_BASE, attrs=["*"]) + res = self.ldb.search(attr_dn, scope=SCOPE_BASE, + attrs=["lDAPDisplayName", "msDS-IntId"]) self.assertEquals(len(res), 1) self.assertEquals(res[0]["lDAPDisplayName"][0], attr_ldap_name) if self.forest_level >= DS_DOMAIN_FUNCTION_2003: @@ -436,7 +445,7 @@ systemOnly: FALSE self.ldb.add_ldif(ldif_add) self._ldap_schemaUpdateNow() - res = self.ldb.search(class_dn, scope=SCOPE_BASE, attrs=["*"]) + res = self.ldb.search(class_dn, scope=SCOPE_BASE, attrs=["msDS-IntId"]) self.assertEquals(len(res), 1) self.assertEquals(res[0]["msDS-IntId"][0], "-1993108831") @@ -448,7 +457,7 @@ systemOnly: FALSE self._ldap_schemaUpdateNow() # Search for created Class - res = self.ldb.search(class_dn, scope=SCOPE_BASE, attrs=["*"]) + res = self.ldb.search(class_dn, scope=SCOPE_BASE, attrs=["msDS-IntId"]) self.assertEquals(len(res), 1) self.assertFalse("msDS-IntId" in res[0]) @@ -473,7 +482,7 @@ systemOnly: FALSE ldif_add = ldif + "msDS-IntId: -1993108831\n" self.ldb.add_ldif(ldif_add) - res = self.ldb.search(class_dn, scope=SCOPE_BASE, attrs=["*"]) + res = self.ldb.search(class_dn, scope=SCOPE_BASE, attrs=["msDS-IntId"]) self.assertEquals(len(res), 1) self.assertEquals(res[0]["msDS-IntId"][0], "-1993108831") @@ -486,7 +495,7 @@ systemOnly: FALSE self._ldap_schemaUpdateNow() # Search for created Class - res = self.ldb.search(class_dn, scope=SCOPE_BASE, attrs=["*"]) + res = self.ldb.search(class_dn, scope=SCOPE_BASE, attrs=["msDS-IntId"]) self.assertEquals(len(res), 1) self.assertFalse("msDS-IntId" in res[0]) @@ -498,7 +507,7 @@ systemOnly: FALSE self.fail("Modifying msDS-IntId should return error") except LdbError, (num, _): self.assertEquals(num, ERR_CONSTRAINT_VIOLATION) - res = self.ldb.search(class_dn, scope=SCOPE_BASE, attrs=["*"]) + res = self.ldb.search(class_dn, scope=SCOPE_BASE, attrs=["msDS-IntId"]) self.assertEquals(len(res), 1) self.assertFalse("msDS-IntId" in res[0]) @@ -532,7 +541,7 @@ class SchemaTests_msDS_isRODC(samba.tests.TestCase): def setUp(self): super(SchemaTests_msDS_isRODC, self).setUp() self.ldb = ldb - res = ldb.search(base="", expression="", scope=SCOPE_BASE, attrs=["*"]) + res = ldb.search(base="", expression="", scope=SCOPE_BASE, attrs=["defaultNamingContext"]) self.assertEquals(len(res), 1) self.base_dn = res[0]["defaultNamingContext"][0] diff --git a/source4/setup/tests/blackbox_provision.sh b/source4/setup/tests/blackbox_provision.sh index 4d7ab81..53be225 100755 --- a/source4/setup/tests/blackbox_provision.sh +++ b/source4/setup/tests/blackbox_provision.sh @@ -32,13 +32,9 @@ rm -rf $PREFIX/simple-standalone testit "simple-standalone" $PYTHON $BINDIR/samba-tool domain provision --server-role="standalone" --domain=FOO --realm=foo.example.com --targetdir=$PREFIX/simple-standalone --use-ntvfs rm -rf $PREFIX/blank-dc testit "blank-dc" $PYTHON $BINDIR/samba-tool domain provision --server-role="dc" --domain=FOO --realm=foo.example.com --domain-sid=S-1-5-21-4177067393-1453636373-93818738 --targetdir=$PREFIX/blank-dc --blank --use-ntvfs -rm -rf $PREFIX/partitions-only-dc -testit "partitions-only-dc" $PYTHON $BINDIR/samba-tool domain provision --server-role="dc" --domain=FOO --realm=foo.example.com --domain-sid=S-1-5-21-4177067393-1453636373-93818738 --targetdir=$PREFIX/partitions-only-dc --partitions-only --use-ntvfs reprovision() { - rm -rf $PREFIX/reprovision - $PYTHON $BINDIR/samba-tool domain provision --domain=FOO --realm=foo.example.com --targetdir="$PREFIX/reprovision" --use-ntvfs - $PYTHON $BINDIR/samba-tool domain provision --domain=FOO --realm=foo.example.com --targetdir="$PREFIX/reprovision" --use-ntvfs + $PYTHON $BINDIR/samba-tool domain provision --domain=FOO --realm=foo.example.com --targetdir="$PREFIX/simple-default" --use-ntvfs } testit "reprovision" reprovision @@ -48,6 +44,5 @@ rm -rf $PREFIX/blank-dc rm -rf $PREFIX/simple-member rm -rf $PREFIX/simple-standalone rm -rf $PREFIX/partitions-only-dc -rm -rf $PREFIX/reprovision exit $failed -- Samba Shared Repository