The branch, master has been updated
via c7d069a4833548e249a74837d6fce02dd09f473c (commit)
via 62b5f1886d06edb94bbb799c07470803cbd9988b (commit)
from b5e8d8d22ae599778e889a8df5a18c07c9180af5 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit c7d069a4833548e249a74837d6fce02dd09f473c
Author: Jelmer Vernooij <[EMAIL PROTECTED]>
Date: Fri Sep 19 12:07:03 2008 +0200
Fix path to ndrdump in blackbox test, don't start smb server for ndrdump
tests.
commit 62b5f1886d06edb94bbb799c07470803cbd9988b
Author: Jelmer Vernooij <[EMAIL PROTECTED]>
Date: Fri Sep 19 10:56:35 2008 +0200
Make sure modify operations succeed.
-----------------------------------------------------------------------
Summary of changes:
source4/librpc/tests/test_ndrdump.sh | 4 ++--
source4/selftest/samba4_tests.sh | 2 +-
testprogs/ejs/samba3sam.js | 8 ++++++++
3 files changed, 11 insertions(+), 3 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source4/librpc/tests/test_ndrdump.sh
b/source4/librpc/tests/test_ndrdump.sh
index dddfc0e..5118560 100755
--- a/source4/librpc/tests/test_ndrdump.sh
+++ b/source4/librpc/tests/test_ndrdump.sh
@@ -8,9 +8,9 @@
failed=0
-samba4bindir=`dirname $0`/../../source4/bin
+samba4bindir=`dirname $0`/../../bin
ndrdump=$samba4bindir/ndrdump
-files=`dirname $0`/ndrdump
+files=`dirname $0`/
testit "ndrdump with in" $VALGRIND $ndrdump samr samr_CreateUser in
$files/samr-CreateUser-in.dat $@ || failed=`expr $failed + 1`
testit "ndrdump with out" $VALGRIND $ndrdump samr samr_CreateUser out
$files/samr-CreateUser-out.dat $@ || failed=`expr $failed + 1`
diff --git a/source4/selftest/samba4_tests.sh b/source4/selftest/samba4_tests.sh
index 3c2bb13..a72024e 100755
--- a/source4/selftest/samba4_tests.sh
+++ b/source4/selftest/samba4_tests.sh
@@ -269,7 +269,7 @@ fi
bbdir=$incdir/../../testprogs/blackbox
-plantest "blackbox.ndrdump" dc $samba4srcdir/librpc/tests/test_ndrdump.sh
+plantest "blackbox.ndrdump" none $samba4srcdir/librpc/tests/test_ndrdump.sh
plantest "blackbox.net" dc $samba4srcdir/utils/tests/test_net.sh "\$SERVER"
"\$USERNAME" "\$PASSWORD" "\$DOMAIN"
plantest "blackbox.kinit" dc $bbdir/test_kinit.sh "\$SERVER" "\$USERNAME"
"\$PASSWORD" "\$REALM" "\$DOMAIN" "$PREFIX" $CONFIGURATION
plantest "blackbox.cifsdd" dc $samba4srcdir/client/tests/test_cifsdd.sh
"\$SERVER" "\$USERNAME" "\$PASSWORD" "\$DOMAIN"
diff --git a/testprogs/ejs/samba3sam.js b/testprogs/ejs/samba3sam.js
index e5639b8..2440747 100644
--- a/testprogs/ejs/samba3sam.js
+++ b/testprogs/ejs/samba3sam.js
@@ -914,6 +914,10 @@ replace: badPwdCount
badPwdCount: 4
";
ok = ldb.modify(ldif);
+ if (ok.error != 0) {
+ println(ok.errstr);
+ assert(ok.error == 0);
+ }
/* Check in mapped db */
attrs = new Array("description", "badPwdCount", "nextRid");
res = ldb.search("", dn, ldb.SCOPE_BASE, attrs);
@@ -992,6 +996,10 @@ replace: description
description: test
";
ok = ldb.modify(ldif);
+ if (ok.error != 0) {
+ println(ok.errstr);
+ assert(ok.error == 0);
+ }
/* Check in mapped db */
attrs = new Array("revision", "description");
res = ldb.search("", dn, ldb.SCOPE_BASE, attrs);
--
Samba Shared Repository
