The branch, master has been updated via bba753b selftest: fix check for RODC and RID Set allocation via 0e37189 python/samba/tests: don't lower case path names in connect_samdb() from 3b48274 selftest: Fix typo namerserver -> nameserver.
https://git.samba.org/?p=samba.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit bba753b53c32d95ee3663f4e83adfb7d71554dae Author: Stefan Metzmacher <me...@samba.org> Date: Mon Jan 26 11:53:12 2015 +0100 selftest: fix check for RODC and RID Set allocation Signed-off-by: Stefan Metzmacher <me...@samba.org> Reviewed-by: Jelmer Vernooij <jel...@samba.org> Autobuild-User(master): Stefan Metzmacher <me...@samba.org> Autobuild-Date(master): Mon Feb 2 01:10:18 CET 2015 on sn-devel-104 commit 0e37189dab01a80c10143a54b80859229e181e9b Author: Stefan Metzmacher <me...@samba.org> Date: Mon Jan 26 08:31:10 2015 +0100 python/samba/tests: don't lower case path names in connect_samdb() We should not lower case file names, because we may get a path to sam.ldb. Now we only lower case ldap urls. For a long time I got failing private autobuild like this: [1623(9233)/1718 at 1h28m9s] samba4.urgent_replication.python(dc)(dc:local) Failed to connect to ldap URL 'ldap:///memdisk/metze/w/b12985/samba/bin/ab/dc/private/sam.ldb' - LDAP client internal error: NT_STATUS_NO_MEMORY Failed to connect to 'ldap:///memdisk/metze/w/b12985/samba/bin/ab/dc/private/sam.ldb' with backend 'ldap': (null) UNEXPECTED(error): samba4.urgent_replication.python(dc).__main__.UrgentReplicationTests.test_attributeSchema_object(dc:local) REASON: _StringException: _StringException: Content-Type: text/x-traceback;charset=utf8,language=python traceback 322 The problem is that /memdisk/metze/W/ is my test directory instead of /memdisk/metze/w/. Signed-off-by: Stefan Metzmacher <me...@samba.org> Reviewed-by: Jelmer Vernooij <jel...@samba.org> ----------------------------------------------------------------------- Summary of changes: python/samba/tests/__init__.py | 1 - selftest/target/Samba4.pm | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) Changeset truncated at 500 lines: diff --git a/python/samba/tests/__init__.py b/python/samba/tests/__init__.py index cca82bb..bda4adf 100644 --- a/python/samba/tests/__init__.py +++ b/python/samba/tests/__init__.py @@ -185,7 +185,6 @@ def connect_samdb(samdb_url, lp=None, session_info=None, credentials=None, to make proper URL for ldb.connect() while using default parameters for connection based on test environment """ - samdb_url = samdb_url.lower() if not "://" in samdb_url: if not ldap_only and os.path.isfile(samdb_url): samdb_url = "tdb://%s" % samdb_url diff --git a/selftest/target/Samba4.pm b/selftest/target/Samba4.pm index 91db4f8..c85b4a7 100755 --- a/selftest/target/Samba4.pm +++ b/selftest/target/Samba4.pm @@ -182,7 +182,7 @@ sub wait_for_start($$) system("$nmblookup $testenv_vars->{CONFIGURATION} -U $testenv_vars->{SERVER_IP} $testenv_vars->{NETBIOSNAME}"); # Ensure we have the first RID Set before we start tests. This makes the tests more reliable. - if ($testenv_vars->{SERVER_ROLE} eq "domain controller" and not ($testenv_vars->{NETBIOS_NAME} eq "rodc")) { + if ($testenv_vars->{SERVER_ROLE} eq "domain controller" and not ($testenv_vars->{NETBIOSNAME} eq "RODC")) { # Add hosts file for name lookups $ENV{NSS_WRAPPER_HOSTS} = $testenv_vars->{NSS_WRAPPER_HOSTS}; if (defined($testenv_vars->{RESOLV_WRAPPER_CONF})) { -- Samba Shared Repository