summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2010-06-20 14:14:47 +0200
committerJelmer Vernooij <jelmer@samba.org>2010-06-20 14:14:47 +0200
commit237ab66f6c292b62b37af05771913b693b32d885 (patch)
tree5a5c223a2b07bc6253b2017ec1051c692f1eca8d
parent7a064b9960ab3cfb4ef76a939da7670aa34519a6 (diff)
downloadsamba-237ab66f6c292b62b37af05771913b693b32d885.tar.gz
samba-237ab66f6c292b62b37af05771913b693b32d885.tar.bz2
samba-237ab66f6c292b62b37af05771913b693b32d885.zip
selftest: Use scripted testparm.
-rw-r--r--selftest/target/Samba4.pm4
-rwxr-xr-xsource4/scripting/bin/testparm4
-rwxr-xr-xsource4/setup/provision3
3 files changed, 6 insertions, 5 deletions
diff --git a/selftest/target/Samba4.pm b/selftest/target/Samba4.pm
index cd88a93114..c19f162d62 100644
--- a/selftest/target/Samba4.pm
+++ b/selftest/target/Samba4.pm
@@ -669,13 +669,13 @@ nogroup:x:65534:nobody
my $configuration = "--configfile=$ctx->{smb_conf}";
#Ensure the config file is valid before we start
- my $testparm = $self->bindir_path("testparm");
+ my $testparm = $self->bindir_path("../scripting/bin/testparm");
if (system("$testparm $configuration -v --suppress-prompt >/dev/null 2>&1") != 0) {
system("$testparm -v --suppress-prompt $configuration >&2");
die("Failed to create a valid smb.conf configuration $testparm!");
}
- (system("($testparm $configuration -v --suppress-prompt --parameter-name=\"netbios name\" --section-name=global 2> /dev/null | grep -i \"^$ctx->{netbiosname}\" ) >/dev/null 2>&1") == 0) or die("Failed to create a valid smb.conf configuration! $self->{bindir}/testparm $configuration -v --suppress-prompt --parameter-name=\"netbios name\" --section-name=global");
+ (system("($testparm $configuration -v --suppress-prompt --parameter-name=\"netbios name\" --section-name=global 2> /dev/null | grep -i \"^$ctx->{netbiosname}\" ) >/dev/null 2>&1") == 0) or die("Failed to create a valid smb.conf configuration! $testparm $configuration -v --suppress-prompt --parameter-name=\"netbios name\" --section-name=global");
my $ret = {
KRB5_CONFIG => $ctx->{krb5_conf},
diff --git a/source4/scripting/bin/testparm b/source4/scripting/bin/testparm
index 95adcf3f16..c2f8bc853f 100755
--- a/source4/scripting/bin/testparm
+++ b/source4/scripting/bin/testparm
@@ -57,7 +57,7 @@ def do_global_checks(lp, logger):
piddir = lp.get("pid directory")
- if os.path.isdir(piddir):
+ if not os.path.isdir(piddir):
logger.error("pid directory %s does not exist", piddir)
valid = False
@@ -125,7 +125,7 @@ if __name__ == '__main__':
help="Client IP address for 'hosts allow' checking")
parser.add_option("--suppress-prompt", action="store_true", default=False,
help="Suppress prompt for enter")
- parser.add_option("--verbose", action="store_true",
+ parser.add_option("-v", "--verbose", action="store_true",
default=False, help="Show default options too")
parser.add_option_group(options.VersionOptions(parser))
# We need support for smb.conf macros before this will work again
diff --git a/source4/setup/provision b/source4/setup/provision
index 58bf804ab0..264245a72c 100755
--- a/source4/setup/provision
+++ b/source4/setup/provision
@@ -252,7 +252,8 @@ try:
backend_type=opts.ldap_backend_type,
ldapadminpass=opts.ldapadminpass, ol_mmr_urls=opts.ol_mmr_urls,
slapd_path=opts.slapd_path, setup_ds_path=opts.setup_ds_path,
- nosync=opts.nosync,ldap_dryrun_mode=opts.ldap_dryrun_mode,useeadb=eadb)
+ nosync=opts.nosync, ldap_dryrun_mode=opts.ldap_dryrun_mode,
+ useeadb=eadb)
except ProvisioningError, e:
print str(e)
exit(1)