diff options
| author | Michael Adam <obnox@samba.org> | 2012-05-29 13:59:14 +0200 |
|---|---|---|
| committer | Michael Adam <obnox@samba.org> | 2012-05-31 04:46:06 +0200 |
| commit | 13181f33411db3abb53771f7a486f849842f8320 (patch) | |
| tree | 6ea9b23c6e742b16b26867123085aafd029c3621 /source3 | |
| parent | 910a4977f102bff08359257fb6481a399921aee6 (diff) | |
| download | samba-13181f33411db3abb53771f7a486f849842f8320.tar.gz samba-13181f33411db3abb53771f7a486f849842f8320.tar.bz2 samba-13181f33411db3abb53771f7a486f849842f8320.zip | |
s3:selftest: improve strange linebreaks for blackbox tests in tests.py for readability
Diffstat (limited to 'source3')
| -rwxr-xr-x | source3/selftest/tests.py | 53 |
1 files changed, 31 insertions, 22 deletions
diff --git a/source3/selftest/tests.py b/source3/selftest/tests.py index 3acf418afc..c131ca238a 100755 --- a/source3/selftest/tests.py +++ b/source3/selftest/tests.py @@ -201,28 +201,37 @@ for env in ["s3dc"]: plantestsuite("samba3.blackbox.smbclient_s3.crypt (%s)" % env, env, [os.path.join(samba3srcdir, "script/tests/test_smbclient_s3.sh"), '$SERVER', '$SERVER_IP', '$DOMAIN', '$USERNAME', '$PASSWORD', '$USERID', '$LOCAL_PATH', '$PREFIX', smbclient, wbinfo, configuration, "-e"]) #TODO encrypted against member, with member creds, and with DC creds -plantestsuite("samba3.blackbox.net.misc", "s3dc:local", [os.path.join(samba3srcdir, "script/tests/test_net_misc.sh"), - scriptdir, "$SMB_CONF_PATH", net, configuration]) -plantestsuite("samba3.blackbox.net.local.registry", "s3dc:local", [os.path.join(samba3srcdir, "script/tests/test_net_registry.sh"), - scriptdir, "$SMB_CONF_PATH", net, configuration]) -plantestsuite("samba3.blackbox.net.registry.check", "s3dc:local", [os.path.join(samba3srcdir, "script/tests/test_net_registry_check.sh"), - scriptdir, "$SMB_CONF_PATH", net, configuration,dbwrap_tool]) -plantestsuite("samba3.blackbox.net.rpc.registry", "s3dc", [os.path.join(samba3srcdir, "script/tests/test_net_registry.sh"), - scriptdir, "$SMB_CONF_PATH", net, configuration, 'rpc']) - -plantestsuite("samba3.blackbox.net.local.registry.roundtrip", "s3dc:local", [os.path.join(samba3srcdir, "script/tests/test_net_registry_roundtrip.sh"), - scriptdir, "$SMB_CONF_PATH", net, configuration]) -plantestsuite("samba3.blackbox.net.rpc.registry.roundtrip", "s3dc", [os.path.join(samba3srcdir, "script/tests/test_net_registry_roundtrip.sh"), - scriptdir, "$SMB_CONF_PATH", net, configuration, 'rpc']) - -plantestsuite("samba3.blackbox.net.local.conf", "s3dc:local", [os.path.join(samba3srcdir, "script/tests/test_net_conf.sh"), - scriptdir, "$SMB_CONF_PATH", net, configuration]) -plantestsuite("samba3.blackbox.net.rpc.conf", "s3dc", [os.path.join(samba3srcdir, "script/tests/test_net_conf.sh"), - scriptdir, "$SMB_CONF_PATH", net, configuration, 'rpc']) - - -plantestsuite("samba3.blackbox.testparm", "s3dc:local", [os.path.join(samba3srcdir, "script/tests/test_testparm_s3.sh"), - "$LOCAL_PATH"]) +plantestsuite("samba3.blackbox.net.misc", "s3dc:local", + [os.path.join(samba3srcdir, "script/tests/test_net_misc.sh"), + scriptdir, "$SMB_CONF_PATH", net, configuration]) +plantestsuite("samba3.blackbox.net.local.registry", "s3dc:local", + [os.path.join(samba3srcdir, "script/tests/test_net_registry.sh"), + scriptdir, "$SMB_CONF_PATH", net, configuration]) +plantestsuite("samba3.blackbox.net.registry.check", "s3dc:local", + [os.path.join(samba3srcdir, "script/tests/test_net_registry_check.sh"), + scriptdir, "$SMB_CONF_PATH", net, configuration,dbwrap_tool]) +plantestsuite("samba3.blackbox.net.rpc.registry", "s3dc", + [os.path.join(samba3srcdir, "script/tests/test_net_registry.sh"), + scriptdir, "$SMB_CONF_PATH", net, configuration, 'rpc']) + +plantestsuite("samba3.blackbox.net.local.registry.roundtrip", "s3dc:local", + [os.path.join(samba3srcdir, "script/tests/test_net_registry_roundtrip.sh"), + scriptdir, "$SMB_CONF_PATH", net, configuration]) +plantestsuite("samba3.blackbox.net.rpc.registry.roundtrip", "s3dc", + [os.path.join(samba3srcdir, "script/tests/test_net_registry_roundtrip.sh"), + scriptdir, "$SMB_CONF_PATH", net, configuration, 'rpc']) + +plantestsuite("samba3.blackbox.net.local.conf", "s3dc:local", + [os.path.join(samba3srcdir, "script/tests/test_net_conf.sh"), + scriptdir, "$SMB_CONF_PATH", net, configuration]) +plantestsuite("samba3.blackbox.net.rpc.conf", "s3dc", + [os.path.join(samba3srcdir, "script/tests/test_net_conf.sh"), + scriptdir, "$SMB_CONF_PATH", net, configuration, 'rpc']) + + +plantestsuite("samba3.blackbox.testparm", "s3dc:local", + [os.path.join(samba3srcdir, "script/tests/test_testparm_s3.sh"), + "$LOCAL_PATH"]) plantestsuite( "samba3.pthreadpool", "s3dc", |