s3:selftest: improve strange linebreaks for blackbox tests in tests.py for readability
authorMichael Adam <obnox@samba.org>
Tue, 29 May 2012 11:59:14 +0000 (13:59 +0200)
committerMichael Adam <obnox@samba.org>
Thu, 31 May 2012 02:46:06 +0000 (04:46 +0200)
source3/selftest/tests.py

index 3acf418afc956c98d7a99bf2d628244b33a20ac9..c131ca238a234c234af42903168df6675e085c91 100755 (executable)
@@ -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",