sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-12-17 04:23:50 +03:00
Code Activity

tests: Use --configfile instead of -s

Browse Source 
We should use long options in tests to make clear what we are trying to
do.

Also the -s short option will be removed for --configfile later.

Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
This commit is contained in:
Andreas Schneider
2021-04-14 11:44:51 +02:00
committed by Andrew Bartlett
parent 86f7bc7a37
commit f291b8f157
25 changed files with 93 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
python/samba/tests/docs.py
View File

@@ -310,8 +310,11 @@ class SmbDotConfTests(TestCase):
else:
self.fail("%s has no valid context" % param)
cmdline = program + ["-s",
self.smbconf,
program_arg1 = ["--configfile=%s" % (self.smbconf)]
if (program[0] == 'bin/testparm'):
program_arg1 = ["--suppress-prompt", self.smbconf]
cmdline = program + program_arg1 + [
"--section-name",
section,
"--parameter-name",
@@ -360,8 +363,11 @@ class SmbDotConfTests(TestCase):
else:
self.fail("%s has no valid context" % param)
cmdline = program + ["-s",
self.smbconf,
program_arg1 = ["--configfile=%s" % (self.smbconf)]
if (program[0] == 'bin/testparm'):
program_arg1 = ["--suppress-prompt", self.smbconf]
cmdline = program + program_arg1 + [
"--section-name",
section,
"--parameter-name",
@@ -434,8 +440,11 @@ class SmbDotConfTests(TestCase):
if value_to_use is None:
self.fail("%s has an invalid type" % param)
cmdline = program + ["-s",
self.smbconf,
program_arg1 = ["--configfile=%s" % (self.smbconf)]
if (program[0] == 'bin/testparm'):
program_arg1 = ["--suppress-prompt", self.smbconf]
cmdline = program + program_arg1 + [
"--section-name",
section,
"--parameter-name",
@@ -478,9 +487,12 @@ class SmbDotConfTests(TestCase):
if program[0] == 'bin/samba-tool' and os.getenv("PYTHON", None):
program = [os.environ["PYTHON"]] + program
p = subprocess.Popen(program + ["-s",
self.blankconf,
"--suppress-prompt"],
program_arg1 = ["--configfile=%s" % (self.blankconf), "--suppress-prompt"]
if (program[0] == 'bin/testparm'):
program_arg1 = ["--suppress-prompt", self.blankconf]
print(program + program_arg1)
p = subprocess.Popen(program + program_arg1,
stdout=subprocess.PIPE,
stderr=subprocess.PIPE,
cwd=self.topdir).communicate()