svn commit: samba r17637 - in branches/SOC/mkhl/testprogs-map/ejs: .

mkhl at samba.org mkhl at samba.org
Sun Aug 20 23:20:45 GMT 2006


Author: mkhl
Date: 2006-08-20 23:20:44 +0000 (Sun, 20 Aug 2006)
New Revision: 17637

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=17637

Log:
Merge from mainline, r17636
Added:
   branches/SOC/mkhl/testprogs-map/ejs/base.js
   branches/SOC/mkhl/testprogs-map/ejs/samba3sam.js
Modified:
   branches/SOC/mkhl/testprogs-map/ejs/ldb.js
   branches/SOC/mkhl/testprogs-map/ejs/samba3sam


Changeset:
Copied: branches/SOC/mkhl/testprogs-map/ejs/base.js (from rev 17636, branches/SAMBA_4_0/testprogs/ejs/base.js)

Modified: branches/SOC/mkhl/testprogs-map/ejs/ldb.js
===================================================================
--- branches/SOC/mkhl/testprogs-map/ejs/ldb.js	2006-08-20 23:14:12 UTC (rev 17636)
+++ branches/SOC/mkhl/testprogs-map/ejs/ldb.js	2006-08-20 23:20:44 UTC (rev 17637)
@@ -18,7 +18,7 @@
 libinclude("base.js");
 
 if (options.ARGV.length != 1) {
-   println("Usage: ldap.js <HOST>");
+   println("Usage: ldb.js <prefix>");
    return -1;
 }
 
@@ -82,19 +82,20 @@
 {
 	ok = ldb.add("
 dn: @MODULES
- at LIST: rootdse,operational,objectguid,rdn_name,partition
+ at LIST: rootdse,operational,rdn_name,partition
 
 dn: cn=ROOTDSE
 defaultNamingContext: cn=Test
 
 dn: @PARTITION
-partition: cn=SideTest:" + prefix +  "testside.ldb
-partition: cn=Sub,cn=PartTest:" + prefix +  "testsub.ldb
-partition: cn=PartTest:" + prefix +  "testpartition.ldb
-partition: cn=Sub,cn=Sub,cn=PartTest:" + prefix +  "testsubsub.ldb
+partition: cn=SideTest:" + prefix + "/" + "testside.ldb
+partition: cn=Sub,cn=PartTest:" + prefix + "/" + "testsub.ldb
+partition: cn=PartTest:" + prefix + "/" + "testpartition.ldb
+partition: cn=Sub,cn=Sub,cn=PartTest:" + prefix + "/" + "testsubsub.ldb
 replicateEntries: @SUBCLASSES
 replicateEntries: @ATTRIBUTES
 replicateEntries: @INDEXLIST
+modules: cn=PartTest:objectguid
 ");
 }
 
@@ -238,9 +239,9 @@
 	assert(res7.length == 0);
 
 	var res8 = ldb.search("x=11", "cn=sub,cn=parttest", ldb.SCOPE_DEFAULT, attrs);
-	assert(res8[0].objectGUID != undefined);
-	assert(res8[0].createTimestamp != undefined);
-	assert(res8[0].whenCreated != undefined);
+	
+	assert(res8[0].objectGUID == undefined); /* The objectGUID module is not loaded here */
+	assert(res8[0].uSNCreated != undefined);
 	assert(res8[0].name == "x11");
 	assert(res8[0].cn == "x11");
 
@@ -348,31 +349,31 @@
 sys = sys_init();
 var dbfile = "test.ldb";
 
-sys.unlink(prefix + dbfile);
-sys.unlink(prefix + "testpartition.ldb");
-sys.unlink(prefix + "testsub.ldb");
-sys.unlink(prefix + "testsubsub.ldb");
-sys.unlink(prefix + "testside.ldb");
+sys.unlink(prefix + "/" + dbfile);
+sys.unlink(prefix + "/" + "testpartition.ldb");
+sys.unlink(prefix + "/" + "testsub.ldb");
+sys.unlink(prefix + "/" + "testsubsub.ldb");
+sys.unlink(prefix + "/" + "testside.ldb");
 
-var ok = ldb.connect("tdb://" + prefix + dbfile);
+var ok = ldb.connect("tdb://" + prefix + "/" + dbfile);
 assert(ok);
 
 basic_tests(ldb);
 
 setup_modules(ldb);
 ldb = ldb_init();
-var ok = ldb.connect("tdb://" + prefix + dbfile);
+var ok = ldb.connect("tdb://" + prefix + "/" + dbfile);
 assert(ok);
 
 parttestldb = ldb_init();
-var ok = parttestldb.connect("tdb://" + prefix + "testpartition.ldb");
+var ok = parttestldb.connect("tdb://" + prefix + "/" + "testpartition.ldb");
 assert(ok);
 
 modules_test(ldb, parttestldb);
 
-sys.unlink(prefix + dbfile);
-sys.unlink(prefix + "testpartition.ldb");
-sys.unlink(prefix + "testsub.ldb");
-sys.unlink(prefix + "testsubsub.ldb");
-sys.unlink(prefix + "testside.ldb");
+sys.unlink(prefix + "/" + dbfile);
+sys.unlink(prefix + "/" + "testpartition.ldb");
+sys.unlink(prefix + "/" + "testsub.ldb");
+sys.unlink(prefix + "/" + "testsubsub.ldb");
+sys.unlink(prefix + "/" + "testside.ldb");
 return 0;

Modified: branches/SOC/mkhl/testprogs-map/ejs/samba3sam
===================================================================
--- branches/SOC/mkhl/testprogs-map/ejs/samba3sam	2006-08-20 23:14:12 UTC (rev 17636)
+++ branches/SOC/mkhl/testprogs-map/ejs/samba3sam	2006-08-20 23:20:44 UTC (rev 17637)
@@ -48,20 +48,13 @@
 assert(ok);
 
 println("Initial samba4 LDIF...");
-var path = "../../source/setup/provision_init.ldif";
+var path = "../../testdata/samba3/provision_samba3sam.ldif"
 var ldif = sys.file_load(mypath + path);
 ldif = substitute_var(ldif, local);
 assert(ldif != undefined);
 ok = s4.add(ldif);
 assert(ok);
 
-var path = "../../source/setup/provision_templates.ldif";
-var ldif = sys.file_load(mypath + path);
-ldif = substitute_var(ldif, local);
-assert(ldif != undefined);
-ok = s4.add(ldif);
-assert(ok);
-
 println("Registering partitions...");
 var ldif = substitute_var(prt_ldif, local);
 assert(ldif != undefined);
@@ -112,6 +105,24 @@
 	assert(oc[i] == "posixGroup" || oc[i] == "group");
 }
 
+println("Looking up by objectClass");
+msg = s4.search("(|(objectClass=user)(cn=Administrator))");
+assert(msg != undefined);
+assert(msg.length == 2);
+for (var i = 0; i < msg.length; i++) {
+    assert((msg[i].dn == "unixName=Administrator,ou=Users,sambaDomainName=TESTS,dc=vernstok,dc=nl") ||
+           (msg[i].dn == "unixName=nobody,ou=Users,sambaDomainName=TESTS,dc=vernstok,dc=nl"));
+}
+
+println("Looking up by objectClass");
+msg = s4.search("(|(objectClass=user)(cn=Administrator))");
+assert(msg != undefined);
+assert(msg.length == 2);
+for (var i = 0; i < msg.length; i++) {
+    assert((msg[i].dn == "unixName=Administrator,ou=Users,sambaDomainName=TESTS,dc=vernstok,dc=nl") ||
+           (msg[i].dn == "unixName=nobody,ou=Users,sambaDomainName=TESTS,dc=vernstok,dc=nl"));
+}
+
 println("Adding a record that will be fallbacked");
 ok = s4.add("
 dn: cn=Foo,dc=idealx,dc=org

Copied: branches/SOC/mkhl/testprogs-map/ejs/samba3sam.js (from rev 17636, branches/SAMBA_4_0/testprogs/ejs/samba3sam.js)



More information about the samba-cvs mailing list