The branch, v4-0-test has been updated via 0df2b3e0b56007850cf83cfdcdb45ca29e162d34 (commit) via 4e06b1d684d6893d79dd6cbd32c2f868dcc559da (commit) via 7b9a647ebbbe9ec9e1b82b42e3a8916396f91273 (commit) via 85c9b21a457ccbf9014ae8f0554a8a5938256a11 (commit) from 2090e75e0c28f8d2aada305059bdb455f42ed0d5 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v4-0-test - Log ----------------------------------------------------------------- commit 0df2b3e0b56007850cf83cfdcdb45ca29e162d34 Author: Andrew Bartlett <[EMAIL PROTECTED]> Date: Thu Apr 17 12:03:49 2008 +0200 Fix the expectations on the unixinfo test. Andrew Bartlett commit 4e06b1d684d6893d79dd6cbd32c2f868dcc559da Author: Andrew Bartlett <[EMAIL PROTECTED]> Date: Thu Apr 17 11:25:19 2008 +0200 Run more tests that were previously skipped. Andrew Bartlett commit 7b9a647ebbbe9ec9e1b82b42e3a8916396f91273 Author: Andrew Bartlett <[EMAIL PROTECTED]> Date: Thu Apr 17 11:22:23 2008 +0200 Skip strcmp() on 2 NULL pointers. Andrew Bartlett commit 85c9b21a457ccbf9014ae8f0554a8a5938256a11 Author: Andrew Bartlett <[EMAIL PROTECTED]> Date: Thu Apr 17 10:40:16 2008 +0200 Use the struct based winbind tests, but mark as known fail. Andrew Bartlett ----------------------------------------------------------------------- Summary of changes: source/lib/talloc/testsuite.c | 3 ++- source/samba4-knownfail | 7 +++++++ source/samba4-skip | 7 +++---- source/scripting/python/samba/tests/dcerpc/unix.py | 4 ++-- source/selftest/samba4_tests.sh | 5 ++++- 5 files changed, 18 insertions(+), 8 deletions(-) Changeset truncated at 500 lines: diff --git a/source/lib/talloc/testsuite.c b/source/lib/talloc/testsuite.c index fedbda9..3f06eee 100644 --- a/source/lib/talloc/testsuite.c +++ b/source/lib/talloc/testsuite.c @@ -48,7 +48,8 @@ static double timeval_elapsed(struct timeval *tv) } #define torture_assert_str_equal(test, arg1, arg2, desc) \ - if (strcmp(arg1, arg2)) { \ + if (arg1 == NULL && arg2 == NULL) { \ + } else if (strcmp(arg1, arg2)) { \ printf("failure: %s [\n%s: Expected %s, got %s: %s\n]\n", \ test, __location__, arg1, arg2, desc); \ return false; \ diff --git a/source/samba4-knownfail b/source/samba4-knownfail index e7d2980..1d8651c 100644 --- a/source/samba4-knownfail +++ b/source/samba4-knownfail @@ -34,3 +34,10 @@ base.charset.*.Testing partial surrogate .*net.api.delshare.* # DelShare isn't implemented yet rap.*netservergetinfo smb2.persistent.handles1 +samba4.winbind.struct.*.LIST_GROUPS # Not yet working in winbind +samba4.winbind.struct.*.SHOW_SEQUENCE # Not yet working in winbind +samba4.winbind.struct.*.GETPWENT # Not yet working in winbind +samba4.winbind.struct.*.SETPWENT # Not yet working in winbind +samba4.winbind.struct.*.LOOKUP_NAME_SID # Not yet working in winbind + + diff --git a/source/samba4-skip b/source/samba4-skip index 19ff924..f4330b9 100644 --- a/source/samba4-skip +++ b/source/samba4-skip @@ -5,11 +5,11 @@ base.casetable base.nttrans .*base.bench.holdcon.* # Very slow base.scan.maxfid -raw.hold.oplock -raw.ping.pong +raw.hold.oplock # Not a test, but a way to block other clients for a test +raw.ping.pong # Needs second server to test rpc.samr_accessmask raw.scan.eamax -raw.qfileinfo.ipc +samba4.ntvfs.cifs.raw.qfileinfo.ipc base.utable base.smb smb2.notify @@ -41,7 +41,6 @@ rpc.frsapi # Not provided by Samba 4 .*samba3.* # Samba3-specific test ^samba4.net.domopen.*$ # Hangs for some reason ^samba4.net.api.become.dc.*$ # Fails -winbind # FIXME: This should not be skipped nss.test # Fails samba4.samba3sam.python # Conversion from EJS not yet finished samba4.samdb.python # Not finished yet diff --git a/source/scripting/python/samba/tests/dcerpc/unix.py b/source/scripting/python/samba/tests/dcerpc/unix.py index 43978ac..78a987c 100644 --- a/source/scripting/python/samba/tests/dcerpc/unix.py +++ b/source/scripting/python/samba/tests/dcerpc/unix.py @@ -27,8 +27,8 @@ class UnixinfoTests(RpcInterfaceTestCase): def test_getpwuid(self): infos = self.conn.GetPWUid(range(512)) self.assertEquals(512, len(infos)) - self.assertEquals("", infos[0].shell) - self.assertEquals("", infos[0].homedir) + self.assertEquals("/bin/false", infos[0].shell) + self.assertTrue(isinstance(infos[0].homedir, unicode)) def test_gidtosid(self): self.conn.GidToSid(1000) diff --git a/source/selftest/samba4_tests.sh b/source/selftest/samba4_tests.sh index 730846d..3b61a97 100755 --- a/source/selftest/samba4_tests.sh +++ b/source/selftest/samba4_tests.sh @@ -219,13 +219,16 @@ plantest "rpc.echo on ncacn_np over smb2" dc $smb4torture ncacn_np:"\$SERVER[smb # Tests against the NTVFS POSIX backend NTVFSARGS="--option=torture:sharedelay=100000 --option=torture:oplocktimeout=3" smb2=`$smb4torture --list | grep "^SMB2-" | xargs` -raw=`$smb4torture --list | grep "^RAW-" | xargs` +#The QFILEINFO-IPC test needs to be on ipc$ +raw=`$smb4torture --list | grep "^RAW-" | grep -v "RAW-QFILEINFO-IPC"| xargs` base=`$smb4torture --list | grep "^BASE-" | xargs` for t in $base $raw $smb2; do plansmbtorturetest "$t" dc $ADDARGS //\$SERVER/tmp -U"\$USERNAME"%"\$PASSWORD" $NTVFSARGS done +plansmbtorturetest "RAW-QFILEINFO-IPC" dc $ADDARGS //\$SERVER/ipc$ -U"\$USERNAME"%"\$PASSWORD" + rap=`$smb4torture --list | grep "^RAP-" | xargs` for t in $rap; do plansmbtorturetest "$t" dc $ADDARGS //\$SERVER/IPC\\\$ -U"\$USERNAME"%"\$PASSWORD" -- Samba Shared Repository