svn commit: samba r8636 - in branches/SAMBA_4_0: source/script/tests testprogs/ejs

[tridge at samba.org]

Author: tridge
Date: 2005-07-20 06:21:30 +0000 (Wed, 20 Jul 2005)
New Revision: 8636

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

Log:
fixed the ejs ldb test to work with the new ldb.search() syntax, and
add it to our test suite so it will be maintained

Modified:
   branches/SAMBA_4_0/source/script/tests/test_ejs.sh
   branches/SAMBA_4_0/testprogs/ejs/ldb.js


Changeset:
Modified: branches/SAMBA_4_0/source/script/tests/test_ejs.sh
===================================================================
--- branches/SAMBA_4_0/source/script/tests/test_ejs.sh	2005-07-20 06:20:36 UTC (rev 8635)
+++ branches/SAMBA_4_0/source/script/tests/test_ejs.sh	2005-07-20 06:21:30 UTC (rev 8636)
@@ -20,7 +20,7 @@
 PATH=bin:$PATH
 export PATH
 
-for f in samr.js echo.js; do
+for f in samr.js echo.js ldb.js; do
     testit "$f" $SCRIPTDIR/$f $CONFIGURATION ncalrpc: -U$USERNAME%$PASSWORD || failed=`expr $failed + 1`
 done
 

Modified: branches/SAMBA_4_0/testprogs/ejs/ldb.js
===================================================================
--- branches/SAMBA_4_0/testprogs/ejs/ldb.js	2005-07-20 06:20:36 UTC (rev 8635)
+++ branches/SAMBA_4_0/testprogs/ejs/ldb.js	2005-07-20 06:21:30 UTC (rev 8636)
@@ -30,17 +30,17 @@
 ");
 	assert(ok);
 	var attrs = new Array("x");
-	res = ldb.search("x=4", attrs);
+	res = ldb.search("x=4", NULL, ldb.SCOPE_DEFAULT, attrs);
 	assert(res[0].x == 4);
 	assert(res[0].objectClass == undefined);
 	assert(res[0].dn == "cn=x2,cn=test");
 
-	ok = ldb.delete("cn=x,cn=test");
+	ok = ldb.del("cn=x,cn=test");
 	assert(ok);
 
 	ok = ldb.rename("cn=x2,cn=test", "cn=x3,cn=test");
 	assert(ok);
-	res = ldb.search("x=4", attrs);
+	res = ldb.search("x=4", NULL, ldb.SCOPE_DEFAULT, attrs);
 	assert(res[0].dn == "cn=x3,cn=test");
 
 	ok = ldb.modify("
@@ -56,15 +56,13 @@
 	
 }
 
-var sys = sys_init();
+sys_init(ldb);
 var dbfile = "test.ldb";
-sys.unlink(dbfile);
+ldb.unlink(dbfile);
 var ok = ldb.connect("tdb://" + dbfile);
 assert(ok);
 
 basic_tests(ldb);
 
-sys.unlink(dbfile);
-
-
-
+ldb.unlink(dbfile);
+return 0;


Property changes on: branches/SAMBA_4_0/testprogs/ejs/ldb.js
___________________________________________________________________
Name: svn:executable
   + *