From 51da6908df8166ee2bcd5783e0ea3116c409f928 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Thu, 7 Feb 2008 23:47:18 +0100 Subject: Override KRB5CCNAME so existing Kerberos tickets in the users environment don't get overwritten. (This used to be commit 5e740c0dfbda9a6b2f47d953eb27a1fbfcff78b3) --- source4/selftest/selftest.pl | 1 + 1 file changed, 1 insertion(+) diff --git a/source4/selftest/selftest.pl b/source4/selftest/selftest.pl index 004332a1fc..aab2ca8f07 100755 --- a/source4/selftest/selftest.pl +++ b/source4/selftest/selftest.pl @@ -382,6 +382,7 @@ die("using an empty absolute prefix isn't allowed") unless $prefix_abs ne ""; die("using '/' as absolute prefix isn't allowed") unless $prefix_abs ne "/"; $ENV{PREFIX} = $prefix; +$ENV{KRB5CCNAME} = "$prefix/krb5ticket"; $ENV{PREFIX_ABS} = $prefix_abs; $ENV{SRCDIR} = $srcdir; $ENV{SRCDIR_ABS} = $srcdir_abs; -- cgit From 64ff80d000bbba270ba2d65381a33049d9b3467d Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Fri, 8 Feb 2008 00:03:02 +0100 Subject: Mark RAW-OFFLINE as known failing for Samba 4 (because it doesn't have offline support yet). (This used to be commit 36167dc85248ed31922cc5ff4a364559f562c51b) --- source4/samba4-knownfail | 1 + 1 file changed, 1 insertion(+) diff --git a/source4/samba4-knownfail b/source4/samba4-knownfail index b1b2140fec..6b2217c467 100644 --- a/source4/samba4-knownfail +++ b/source4/samba4-knownfail @@ -34,3 +34,4 @@ RPC-NETLOGON.*.GetTrustPasswords BASE-CHARSET.*.Testing partial surrogate .*NET-API-DELSHARE.* # DelShare isn't implemented yet RAP.*netservergetinfo +RAW-OFFLINE # Samba 4 doesn't have much offline support yet -- cgit From bebd139db02408b29b78b2ef9502d1363d45b3f9 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Fri, 8 Feb 2008 00:19:50 +0100 Subject: Put ldb test output in prefix. (This used to be commit af283cd787ef4642fc4ba642ea37a1eede2d2f41) --- source4/selftest/samba4_tests.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source4/selftest/samba4_tests.sh b/source4/selftest/samba4_tests.sh index 2068a971ca..17b6020abb 100755 --- a/source4/selftest/samba4_tests.sh +++ b/source4/selftest/samba4_tests.sh @@ -74,7 +74,7 @@ done # is now pretty well tested by the rest of the quick tests anyway LDBDIR=$samba4srcdir/lib/ldb export LDBDIR -plantest "ldb" none $LDBDIR/tests/test-tdb.sh +plantest "ldb" none TEST_DATA_PREFIX=\$PREFIX $LDBDIR/tests/test-tdb.sh plantest "js.ldap" dc $SCRIPTDIR/ldap.js $CONFIGURATION -d 10 \$SERVER -U\$USERNAME%\$PASSWORD -- cgit From 066912ba806733587a1948235e8026107ac563a6 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Fri, 8 Feb 2008 00:34:29 +0100 Subject: Put temporary test files in test directory. (This used to be commit 16382999bebf158996e16219e7053ef4821550c1) --- testprogs/blackbox/test_kinit.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testprogs/blackbox/test_kinit.sh b/testprogs/blackbox/test_kinit.sh index db12fba2f8..d4eff07c8d 100755 --- a/testprogs/blackbox/test_kinit.sh +++ b/testprogs/blackbox/test_kinit.sh @@ -56,7 +56,7 @@ test_smbclient() { return $status } -KRB5CCNAME=`pwd`/tmpccache +KRB5CCNAME="$PREFIX/tmpccache" export KRB5CCNAME echo $PASSWORD > ./tmppassfile -- cgit From b4f7a80c2d2bd6bd721bf94c8ea4ff8dc56eb8d7 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Fri, 8 Feb 2008 01:19:14 +0100 Subject: Skip offline tests. (This used to be commit 3c71aae2a3e3de0e2372410dd363a7d6015174e6) --- source4/samba4-knownfail | 1 - source4/samba4-skip | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/source4/samba4-knownfail b/source4/samba4-knownfail index 6b2217c467..b1b2140fec 100644 --- a/source4/samba4-knownfail +++ b/source4/samba4-knownfail @@ -34,4 +34,3 @@ RPC-NETLOGON.*.GetTrustPasswords BASE-CHARSET.*.Testing partial surrogate .*NET-API-DELSHARE.* # DelShare isn't implemented yet RAP.*netservergetinfo -RAW-OFFLINE # Samba 4 doesn't have much offline support yet diff --git a/source4/samba4-skip b/source4/samba4-skip index 8ce9c4f9cc..b53f444c9c 100644 --- a/source4/samba4-skip +++ b/source4/samba4-skip @@ -50,3 +50,4 @@ RPC-FRSAPI # Not provided by Samba 4 WINBIND # FIXME: This should not be skipped NSS-TEST # Fails samba4.samba3sam.python # Conversion from EJS not yet finished +RAW-OFFLINE # Samba 4 doesn't have much offline support yet -- cgit From bbf8aca01daeb4519ee12ff1eadf26598dc7a747 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Fri, 8 Feb 2008 13:23:45 +1100 Subject: Fix syntax in LDAP test We don't get this far in the test at the moment however. Andrew Bartlett (This used to be commit c3098d5c52505e143a6ce498273a5ce6a66220b0) --- source4/lib/ldb/tests/python/ldap.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/source4/lib/ldb/tests/python/ldap.py b/source4/lib/ldb/tests/python/ldap.py index d35f7767df..a425ddc830 100755 --- a/source4/lib/ldb/tests/python/ldap.py +++ b/source4/lib/ldb/tests/python/ldap.py @@ -523,12 +523,12 @@ member: cn=ldaptestuser4,cn=ldaptestcontainer,""" + base_dn + """ assert len(res) == 0 print "Testing one-level ldb.search for (&(cn=ldaptestuser4)(objectClass=user)) in cn=ldaptestcontainer2," + base_dn - res = ldb.search(expression="(&(cn=ldaptestuser4)(objectClass=user))", base="cn=ldaptestcontainer2," + base_dn, scope=SCOPE_ONELEVEL) - # FIXME: assert len(res) == 0 + res = ldb.search(expression="(&(cn=ldaptestuser4)(objectClass=user))", base=("cn=ldaptestcontainer2," + base_dn), scope=SCOPE_ONELEVEL) + assert len(res) == 0 print "Testing one-level ldb.search for (&(cn=ldaptestuser4)(objectClass=user)) in cn=ldaptestcontainer2," + base_dn - res = ldb.search(expression="(&(cn=ldaptestuser4)(objectClass=user))", base="cn=ldaptestcontainer2," + base_dn, scope=SCOPE_SUBTREE) - #FIXME: assert len(res) == 0 + res = ldb.search(expression="(&(cn=ldaptestuser4)(objectClass=user))", base=("cn=ldaptestcontainer2," + base_dn), scope=SCOPE_SUBTREE) + assert len(res) == 0 print "Testing delete of subtree renamed "+("CN=ldaptestuser4,CN=ldaptestcontainer2," + base_dn) ldb.delete(("CN=ldaptestuser4,CN=ldaptestcontainer2," + base_dn)) -- cgit