diff options
Diffstat (limited to 'source4/selftest')
| -rw-r--r-- | source4/selftest/config.mk | 2 | ||||
| -rw-r--r-- | source4/selftest/knownfail | 86 | ||||
| -rwxr-xr-x | source4/selftest/tests.sh | 14 |
3 files changed, 51 insertions, 51 deletions
diff --git a/source4/selftest/config.mk b/source4/selftest/config.mk index 6057de68f9..c4c5e190a9 100644 --- a/source4/selftest/config.mk +++ b/source4/selftest/config.mk @@ -13,7 +13,7 @@ ST_DONE_TEST = @test -f $(selftest_prefix)/st_done || { echo "SELFTEST FAILED"; SELFTEST_NOSLOW_OPTS = --exclude=$(srcdir)/selftest/slow SELFTEST_QUICK_OPTS = $(SELFTEST_NOSLOW_OPTS) --quick --include=$(srcdir)/selftest/quick -FILTER_XFAIL = $(PERL) $(selftestdir)/filter-subunit.pl --expected-failures=$(srcdir)/selftest/knownfail +FILTER_XFAIL = $(PYTHON) $(selftestdir)/filter-subunit --expected-failures=$(srcdir)/selftest/knownfail SUBUNIT_FORMATTER ?= $(PYTHON) $(selftestdir)/format-subunit --prefix=${selftest_prefix} --immediate FORMAT_TEST_OUTPUT = $(FILTER_XFAIL) | $(SUBUNIT_FORMATTER) diff --git a/source4/selftest/knownfail b/source4/selftest/knownfail index a6b7161019..60606ace56 100644 --- a/source4/selftest/knownfail +++ b/source4/selftest/knownfail @@ -3,63 +3,63 @@ # # "make test" will not report failures for tests listed here and will consider # a successful run for any of these tests an error. -local.resolve.*.async -local.iconv.*.next_codepoint() -base.delete.*.deltest17 -base.delete.*.deltest20a -base.delete.*.deltest20b -raw.rename.*.osxrename -raw.rename.*.directory rename -rpc.winreg.*security +samba4.local.resolve.*.async +samba4.local.iconv.*.next_codepoint() +samba4..*base.delete.*.deltest17 +samba4..*base.delete.*.deltest20a +samba4..*base.delete.*.deltest20b +samba4.raw.rename.*.osxrename +samba4.raw.rename.*.directory rename +samba4.rpc.winreg.*security samba4.local.registry.(dir|ldb).check hive security samba4.local.registry.local.security -rpc.wkssvc -rpc.handles.*.lsarpc-shared -rpc.handles.*.mixed-shared -rpc.epmapper.*.Insert -rpc.epmapper.*.InqObject -rpc.drsuapi.* -rpc.lsalookup -rpc.cracknames -rpc.netlogon.*.LogonUasLogon -rpc.netlogon.*.LogonUasLogoff -rpc.netlogon.*.DatabaseSync -rpc.netlogon.*.DatabaseSync2 -rpc.netlogon.*.LogonControl -rpc.netlogon.*.LogonControl2 -rpc.netlogon.*.DsrEnumerateDomainTrusts -rpc.netlogon.*.NetrEnumerateTrustedDomains -rpc.netlogon.*.NetrEnumerateTrustedDomainsEx -rpc.netlogon.*.DsrGetDcSiteCoverageW -rpc.netlogon.*.DsRAddressToSitenamesW -rpc.netlogon.*.DsRAddressToSitenamesExW -rpc.netlogon.*.GetPassword -rpc.netlogon.*.GetTrustPasswords -rpc.netlogon.*.DatabaseRedo -rpc.netlogon.*.ServerGetTrustInfo -rpc.netlogon.*.GetDomainInfo # Also fails against W2K8 (but in a different way) +samba4.rpc.wkssvc +samba4.rpc.handles.*.lsarpc-shared +samba4.rpc.handles.*.mixed-shared +samba4.rpc.epmapper.*.Insert +samba4.rpc.epmapper.*.InqObject +samba4.rpc.drsuapi.* +samba4.rpc.lsalookup +samba4.rpc.cracknames +samba4.rpc.netlogon.*.LogonUasLogon +samba4.rpc.netlogon.*.LogonUasLogoff +samba4.rpc.netlogon.*.DatabaseSync +samba4.rpc.netlogon.*.DatabaseSync2 +samba4.rpc.netlogon.*.LogonControl +samba4.rpc.netlogon.*.LogonControl2 +samba4.rpc.netlogon.*.DsrEnumerateDomainTrusts +samba4.rpc.netlogon.*.NetrEnumerateTrustedDomains +samba4.rpc.netlogon.*.NetrEnumerateTrustedDomainsEx +samba4.rpc.netlogon.*.DsrGetDcSiteCoverageW +samba4.rpc.netlogon.*.DsRAddressToSitenamesW +samba4.rpc.netlogon.*.DsRAddressToSitenamesExW +samba4.rpc.netlogon.*.GetPassword +samba4.rpc.netlogon.*.GetTrustPasswords +samba4.rpc.netlogon.*.DatabaseRedo +samba4.rpc.netlogon.*.ServerGetTrustInfo +samba4.rpc.netlogon.*.GetDomainInfo # Also fails against W2K8 (but in a different way) samba4.rpc.samr.passwords.pwdlastset # Not provided by Samba 4 yet samba4.rpc.samr.passwords.badpwdcount # Not provided by Samba 4 yet samba4.rpc.samr.passwords.lockout samba4.rpc.samr.users.privileges samba4.rpc.spoolss # Not provided by Samba 4 yet -base.charset.*.Testing partial surrogate +samba4.base.charset.*.Testing partial surrogate .*net.api.delshare.* # DelShare isn't implemented yet ^samba4.net.api.become.dc.*$ # TODO: this should work!!! -rap.*netservergetinfo -smb2.persistent.handles1 +samba4.rap.*netservergetinfo +samba4.smb2.persistent.handles1 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 samba4.winbind.struct.*.LIST_GROUPS -^samba4.*base.delaywrite.*update of write time and SMBwrite truncate$ -^samba4.*base.delaywrite.*update of write time and SMBwrite truncate expand$ -^samba4.*base.delaywrite.*delayed update of write time 3a$ -^samba4.*base.delaywrite.*delayed update of write time 3c$ -^samba4.*base.delaywrite.*update of write time using SET_END_OF_FILE$ -^samba4.*base.delaywrite.*update of write time using SET_ALLOCATION_SIZE$ -^samba4.ldap.python \(dc\).Test add_ldif\(\) with BASE64 security descriptor input using WRONG domain SID$ +samba4.*base.delaywrite.*update of write time and SMBwrite truncate$ +samba4.*base.delaywrite.*update of write time and SMBwrite truncate expand$ +samba4.*base.delaywrite.*delayed update of write time 3a$ +samba4.*base.delaywrite.*delayed update of write time 3c$ +samba4.*base.delaywrite.*update of write time using SET_END_OF_FILE$ +samba4.*base.delaywrite.*update of write time using SET_ALLOCATION_SIZE$ +samba4.ldap.python \(dc\).Test add_ldif\(\) with BASE64 security descriptor input using WRONG domain SID$ # some operations don't work over the CIFS NTVFS backend yet (eg. root_fid) samba4.ntvfs.cifs.base.createx_access samba4.ntvfs.cifs.base.createx_sharemodes_dir diff --git a/source4/selftest/tests.sh b/source4/selftest/tests.sh index f832b4f15e..bf6127f4a5 100755 --- a/source4/selftest/tests.sh +++ b/source4/selftest/tests.sh @@ -85,7 +85,7 @@ smb4torture="$samba4bindir/smbtorture${EXEEXT}" if which tap2subunit 2>/dev/null; then TAP2SUBUNIT=tap2subunit else - TAP2SUBUNIT="PYTHONPATH=$samba4srcdir/../lib/subunit/python $PYTHON $samba4srcdir/../lib/subunit/filters/tap2subunit" + TAP2SUBUNIT="PYTHONPATH=$samba4srcdir/../lib/subunit/python:$samba4srcdir/../lib/testtools $PYTHON $samba4srcdir/../lib/subunit/filters/tap2subunit" fi $smb4torture -V @@ -466,15 +466,15 @@ plantest "samba3sam.python" none PYTHONPATH="$PYTHONPATH:$samba4srcdir/dsdb/samd plantest "subunit.python" none $SUBUNITRUN subunit plantest "rpcecho.python" dc:local $SUBUNITRUN samba.tests.dcerpc.rpcecho plantest "winreg.python" dc:local $SUBUNITRUN -U\$USERNAME%\$PASSWORD samba.tests.dcerpc.registry -plantest "ldap.python" dc PYTHONPATH="$PYTHONPATH:../lib/subunit/python" $PYTHON $samba4srcdir/lib/ldb/tests/python/ldap.py $CONFIGURATION \$SERVER -U\$USERNAME%\$PASSWORD -W \$DOMAIN -plantest "urgent_replication.python" dc PYTHONPATH="$PYTHONPATH:../lib/subunit/python" $PYTHON $samba4srcdir/lib/ldb/tests/python/urgent_replication.py \$PREFIX_ABS/dc/private/sam.ldb -plantest "ldap_schema.python" dc PYTHONPATH="$PYTHONPATH:../lib/subunit/python" $PYTHON $samba4srcdir/lib/ldb/tests/python/ldap_schema.py $CONFIGURATION \$SERVER -U\$USERNAME%\$PASSWORD -W \$DOMAIN +plantest "ldap.python" dc PYTHONPATH="$PYTHONPATH:../lib/subunit/python:../lib/testtools" $PYTHON $samba4srcdir/lib/ldb/tests/python/ldap.py $CONFIGURATION \$SERVER -U\$USERNAME%\$PASSWORD -W \$DOMAIN +plantest "urgent_replication.python" dc PYTHONPATH="$PYTHONPATH:../lib/subunit/python:../lib/testtools" $PYTHON $samba4srcdir/lib/ldb/tests/python/urgent_replication.py \$PREFIX_ABS/dc/private/sam.ldb +plantest "ldap_schema.python" dc PYTHONPATH="$PYTHONPATH:../lib/subunit/python:../lib/testtools" $PYTHON $samba4srcdir/lib/ldb/tests/python/ldap_schema.py $CONFIGURATION \$SERVER -U\$USERNAME%\$PASSWORD -W \$DOMAIN plantest "ldap.possibleInferiors.python" dc $PYTHON $samba4srcdir/dsdb/samdb/ldb_modules/tests/possibleinferiors.py $CONFIGURATION ldap://\$SERVER -U\$USERNAME%\$PASSWORD -W \$DOMAIN -plantest "ldap.secdesc.python" dc PYTHONPATH="$PYTHONPATH:../lib/subunit/python" $PYTHON $samba4srcdir/lib/ldb/tests/python/sec_descriptor.py $CONFIGURATION \$SERVER -U\$USERNAME%\$PASSWORD -W \$DOMAIN -plantest "ldap.acl.python" dc PYTHONPATH="$PYTHONPATH:../lib/subunit/python" $PYTHON $samba4srcdir/lib/ldb/tests/python/acl.py $CONFIGURATION \$SERVER -U\$USERNAME%\$PASSWORD -W \$DOMAIN +plantest "ldap.secdesc.python" dc PYTHONPATH="$PYTHONPATH:../lib/subunit/python:../lib/testtools" $PYTHON $samba4srcdir/lib/ldb/tests/python/sec_descriptor.py $CONFIGURATION \$SERVER -U\$USERNAME%\$PASSWORD -W \$DOMAIN +plantest "ldap.acl.python" dc PYTHONPATH="$PYTHONPATH:../lib/subunit/python:../lib/testtools" $PYTHON $samba4srcdir/lib/ldb/tests/python/acl.py $CONFIGURATION \$SERVER -U\$USERNAME%\$PASSWORD -W \$DOMAIN plantest "xattr.python" none $SUBUNITRUN samba.tests.xattr plantest "ntacls.python" none $SUBUNITRUN samba.tests.ntacls -plantest "deletetest.python" dc PYTHONPATH="$PYTHONPATH:../lib/subunit/python" $PYTHON $samba4srcdir/lib/ldb/tests/python/deletetest.py $CONFIGURATION \$SERVER -U\$USERNAME%\$PASSWORD -W \$DOMAIN +plantest "deletetest.python" dc PYTHONPATH="$PYTHONPATH:../lib/subunit/python:../lib/testtools" $PYTHON $samba4srcdir/lib/ldb/tests/python/deletetest.py $CONFIGURATION \$SERVER -U\$USERNAME%\$PASSWORD -W \$DOMAIN plantest "blackbox.samba3dump" none $PYTHON $samba4srcdir/scripting/bin/samba3dump $samba4srcdir/../testdata/samba3 rm -rf $PREFIX/upgrade plantest "blackbox.upgrade" none $PYTHON $samba4srcdir/setup/upgrade_from_s3 $CONFIGURATION --targetdir=$PREFIX/upgrade $samba4srcdir/../testdata/samba3 ../testdata/samba3/smb.conf |