Rev 11643: Fix Samba 3 data read tests. I can't figure out why the
upgrade one is broken, so that one is still disabled. in
file:///home/jelmer/bzr.samba/SAMBA_4_0/
Jelmer Vernooij
jelmer at samba.org
Sat Mar 3 02:03:54 GMT 2007
At file:///home/jelmer/bzr.samba/SAMBA_4_0/
------------------------------------------------------------
revno: 11643
revision-id: jelmer at samba.org-20070303020345-gesw3rzz8mfrmmis
parent: svn-v2:21671 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: SAMBA_4_0
timestamp: Sat 2007-03-03 03:03:45 +0100
message:
Fix Samba 3 data read tests. I can't figure out why the upgrade one is broken, so that one is still disabled.
modified:
source/script/tests/tests_all.sh svn-v2:8525 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0-source%2fscript%2ftests%2ftests_all.sh
source/scripting/libjs/upgrade.js svn-v2:9722 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0-source%2fscripting%2flibjs%2fupgrade.js
source/setup/upgrade svn-v2:9735 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0-source%2fsetup%2fupgrade
testdata/samba3/verify svn-v2:9834 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0-testdata%2fsamba3%2fverify
=== modified file 'source/script/tests/tests_all.sh'
--- a/source/script/tests/tests_all.sh 2007-01-26 13:43:21 +0000
+++ b/source/script/tests/tests_all.sh 2007-03-03 02:03:45 +0000
@@ -12,3 +12,4 @@
$SRCDIR/script/tests/test_pidl.sh
$SRCDIR/script/tests/test_blackbox.sh $SERVER $USERNAME $PASSWORD $DOMAIN $PREFIX
$SRCDIR/script/tests/test_simple.sh //$SERVER/simple $USERNAME $PASSWORD ""
+ $SRCDIR/script/tests/test_s3upgrade.sh $PREFIX/upgrade
=== modified file 'source/scripting/libjs/upgrade.js'
--- a/source/scripting/libjs/upgrade.js 2007-01-11 23:09:57 +0000
+++ b/source/scripting/libjs/upgrade.js 2007-03-03 02:03:45 +0000
@@ -357,7 +357,6 @@
subobj.NTTIME = nttime;
subobj.LDAPTIME = ldaptime;
subobj.DATESTRING = datestring;
- subobj.USN = nextusn;
subobj.ROOT = findnss(nss.getpwnam, "root");
subobj.NOBODY = findnss(nss.getpwnam, "nobody");
subobj.NOGROUP = findnss(nss.getgrnam, "nogroup", "nobody");
@@ -368,7 +367,26 @@
strlower(subobj.HOSTNAME),
subobj.DNSDOMAIN);
subobj.BASEDN = "DC=" + join(",DC=", split(".", subobj.REALM));
- rdn_list = split(".", subobj.REALM);
+ rdn_list = split(".", subobj.DNSDOMAIN);
+ subobj.DOMAINDN = "DC=" + join(",DC=", rdn_list);
+ subobj.DOMAINDN_LDB = "users.ldb";
+ subobj.ROOTDN = subobj.DOMAINDN;
+
+ modules_list = new Array("rootdse",
+ "kludge_acl",
+ "paged_results",
+ "server_sort",
+ "extended_dn",
+ "asq",
+ "samldb",
+ "password_hash",
+ "operational",
+ "objectclass",
+ "rdn_name",
+ "show_deleted",
+ "partition");
+ subobj.MODULES_LIST = join(",", modules_list);
+
return subobj;
}
=== modified file 'source/setup/upgrade'
--- a/source/setup/upgrade 2006-01-22 08:32:34 +0000
+++ b/source/setup/upgrade 2007-03-03 02:03:45 +0000
@@ -95,7 +95,7 @@
subobj.REALM = options.realm;
}
-provision(subobj, message, options.blank, paths, system_session, creds);
+provision(subobj, message, options.blank, paths, system_session, creds, undefined);
var ret = upgrade(subobj,samba3,message,paths, system_session, creds);
if (ret > 0) {
=== modified file 'testdata/samba3/verify'
--- a/testdata/samba3/verify 2005-08-31 16:51:09 +0000
+++ b/testdata/samba3/verify 2007-03-03 02:03:45 +0000
@@ -5,6 +5,13 @@
Written by Jelmer Vernooij, 2005.
*/
+var sys;
+var options = GetOptions(ARGV, "POPT_AUTOHELP", "POPT_COMMON_SAMBA");
+if (options == undefined) {
+ println("Failed to parse options");
+ return -1;
+}
+
libinclude("base.js");
var path = substr(ARGV[0], 0, -strlen("verify"));
@@ -49,3 +56,4 @@
println("account policies ok");
+exit(0);
More information about the samba-cvs
mailing list