From 67a851a05074d2ffd72d54a482a72859e8377b2f Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Fri, 27 Apr 2012 12:49:14 +1000 Subject: [PATCH] selftest: Remove silly space before unit test name When we have no description, there is no need for a leading space here Andrew Bartlett --- selftest/knownfail | 114 +++++++++++++++++++------------------- source3/selftest/tests.py | 6 +- 2 files changed, 62 insertions(+), 58 deletions(-) diff --git a/selftest/knownfail b/selftest/knownfail index 525fb4cd0cf..14dac54eceb 100644 --- a/selftest/knownfail +++ b/selftest/knownfail @@ -22,7 +22,7 @@ ^samba3.nbt.dgram.*netlogon2 ^samba3.*rap.sam.*.useradd # Not provided by Samba 3 ^samba3.*rap.sam.*.userdelete # Not provided by Samba 3 -^samba3.libsmbclient .opendir # This requires a workgroup called 'WORKGROUP' and for netbios browse lists to have been registered +^samba3.libsmbclient.opendir # This requires a workgroup called 'WORKGROUP' and for netbios browse lists to have been registered # see bug 8412 ^samba3.smb2.rename.*.simple_nodelete ^samba3.smb2.rename.*.no_share_delete_no_delete_access @@ -35,7 +35,7 @@ ^samba3.blackbox.rpcclient over ncacn_np with \[spnego,smb2,bigendian\] ^samba3.blackbox.rpcclient over ncacn_np with \[spnego,connect,smb2\] ^samba3.blackbox.rpcclient over ncacn_np with \[spnego,connect,smb2,bigendian\] -^samba3.raw.composite .appendacl # This needs ACL and IDMAP behaviour that s3 cannot provide, including mapping of arbitary sids. +^samba3.raw.composite.appendacl # This needs ACL and IDMAP behaviour that smbd cannot provide, including mapping of arbitary sids. # these show that we still have some differences between our system # with our internal iconv because it passes except when we bypass our # internal iconv modules @@ -112,8 +112,8 @@ #^samba4.ldap.dirsync.python.dc..__main__.ExtendedDirsyncTests.* ^samba4.drs.fsmo.python ^samba4.libsmbclient.opendir.opendir # This requires netbios browsing -^samba4.rpc.drsuapi .*.drsuapi.DsGetDomainControllerInfo$ -^samba4.rpc.drsuapi .*.drsuapi.DsCrackNames$ +^samba4.rpc.drsuapi.*.drsuapi.DsGetDomainControllerInfo$ +^samba4.rpc.drsuapi.*.drsuapi.DsCrackNames$ ^samba4.smb2.oplock.exclusive2$ # samba 4 oplocks are a mess ^samba4.smb2.oplock.exclusive5$ # samba 4 oplocks are a mess ^samba4.smb2.oplock.exclusive6$ # samba 4 oplocks are a mess @@ -139,58 +139,58 @@ ^samba4.ldap.acl.*.AclSearchTests.test_search5$ # ACL search behaviour not enabled by default ^samba4.ldap.acl.*.AclSearchTests.test_search6$ # ACL search behaviour not enabled by default ^samba4.rpc.lsa.forest.trust #Not fully provided by Samba4 -^samba3.smb2.create .gentest -^samba3.smb2.create .blob -^samba3.smb2.create .open -^samba3.smb2.create .leading-slash -^samba3.smb2.create .aclfile -^samba3.smb2.create .acldir -^samba3.smb2.create .nulldacl -^samba3.smb2.notify .valid-req -^samba3.smb2.notify .dir -^samba3.smb2.notify .rec -^samba3.smb2.durable-open .file-position -^samba3.smb2.durable-open .lease -^samba3.smb2.durable-open .lock -^samba3.smb2.durable-open .open -^samba3.smb2.durable-open .reopen1 -^samba3.smb2.durable-open .reopen2 -^samba3.smb2.durable-open .reopen2a -^samba3.smb2.durable-open .reopen3 -^samba3.smb2.durable-open .reopen4 -^samba3.smb2.durable-open .oplock -^samba3.smb2.durable-v2-open .open-oplock -^samba3.smb2.durable-v2-open .open-lease -^samba3.smb2.durable-v2-open .persistent-open-oplock -^samba3.smb2.durable-v2-open .persistent-open-lease -^samba3.smb2.ioctl .shadow_copy -^samba3.smb2.ioctl .req_resume_key -^samba3.smb2.ioctl .copy_chunk_simple -^samba3.smb2.ioctl .copy_chunk_multi -^samba3.smb2.ioctl .copy_chunk_tiny -^samba3.smb2.ioctl .copy_chunk_overwrite -^samba3.smb2.ioctl .copy_chunk_append -^samba3.smb2.dir .one -^samba3.smb2.dir .modify -^samba3.smb2.lease .request -^samba3.smb2.lease .upgrade -^samba3.smb2.lease .break -^samba3.smb2.lease .oplock -^samba3.smb2.lease .multibreak -^samba3.smb2.oplock .batch12 -^samba3.smb2.oplock .batch20 -^samba3.smb2.acls .CREATOR -^samba3.smb2.acls .GENERIC -^samba3.smb2.acls .OWNER -^samba3.smb2.acls .INHERITANCE -^samba3.smb2.acls .INHERITFLAGS -^samba3.smb2.acls .DYNAMIC -^samba3.smb2.streams .rename -^samba3.smb2.streams .rename2 -^samba3.smb2.streams .attributes -^samba3.smb2.getinfo .getinfo -^samba3.smb2.setinfo .setinfo -^samba3.smb2.session .reconnect -^samba3.smb2.session .reauth +^samba3.smb2.create.gentest +^samba3.smb2.create.blob +^samba3.smb2.create.open +^samba3.smb2.create.leading-slash +^samba3.smb2.create.aclfile +^samba3.smb2.create.acldir +^samba3.smb2.create.nulldacl +^samba3.smb2.notify.valid-req +^samba3.smb2.notify.dir +^samba3.smb2.notify.rec +^samba3.smb2.durable-open.file-position +^samba3.smb2.durable-open.lease +^samba3.smb2.durable-open.lock +^samba3.smb2.durable-open.open +^samba3.smb2.durable-open.reopen1 +^samba3.smb2.durable-open.reopen2 +^samba3.smb2.durable-open.reopen2a +^samba3.smb2.durable-open.reopen3 +^samba3.smb2.durable-open.reopen4 +^samba3.smb2.durable-open.oplock +^samba3.smb2.durable-v2-open.open-oplock +^samba3.smb2.durable-v2-open.open-lease +^samba3.smb2.durable-v2-open.persistent-open-oplock +^samba3.smb2.durable-v2-open.persistent-open-lease +^samba3.smb2.ioctl.shadow_copy +^samba3.smb2.ioctl.req_resume_key +^samba3.smb2.ioctl.copy_chunk_simple +^samba3.smb2.ioctl.copy_chunk_multi +^samba3.smb2.ioctl.copy_chunk_tiny +^samba3.smb2.ioctl.copy_chunk_overwrite +^samba3.smb2.ioctl.copy_chunk_append +^samba3.smb2.dir.one +^samba3.smb2.dir.modify +^samba3.smb2.lease.request +^samba3.smb2.lease.upgrade +^samba3.smb2.lease.break +^samba3.smb2.lease.oplock +^samba3.smb2.lease.multibreak +^samba3.smb2.oplock.batch12 +^samba3.smb2.oplock.batch20 +^samba3.smb2.acls.CREATOR +^samba3.smb2.acls.GENERIC +^samba3.smb2.acls.OWNER +^samba3.smb2.acls.INHERITANCE +^samba3.smb2.acls.INHERITFLAGS +^samba3.smb2.acls.DYNAMIC +^samba3.smb2.streams.rename +^samba3.smb2.streams.rename2 +^samba3.smb2.streams.attributes +^samba3.smb2.getinfo.getinfo +^samba3.smb2.setinfo.setinfo +^samba3.smb2.session.reconnect +^samba3.smb2.session.reauth ^samba3.rpc.spoolss.printer.*addprinter.driver_info_winreg # knownfail or flapping? ^samba3.rpc.spoolss.printer.*addprinterex.driver_info_winreg # knownfail or flapping? diff --git a/source3/selftest/tests.py b/source3/selftest/tests.py index 1a110819626..9535cbb71be 100755 --- a/source3/selftest/tests.py +++ b/source3/selftest/tests.py @@ -54,7 +54,11 @@ def smb4torture_testsuites(prefix): def plansmbtorturetestsuite(name, env, options, description=''): target = "samba3" - modname = "%s.%s %s" % (target, name, description) + if description == '': + modname = "%s.%s" % (target, name) + else: + modname = "%s.%s %s" % (target, name, description) + cmdline = "%s $LISTOPT %s --target=%s %s" % (valgrindify(smb4torture), options, target, name) if smb4torture_possible: plantestsuite_loadlist(modname, env, cmdline)