tests: Use --configfile instead of -s

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>

3 files changed, 23 insertions, 11 deletions

diff --git a/python/samba/tests/blackbox/mdsearch.py b/python/samba/tests/blackbox/mdsearch.py
index 8da5a49e136..c9156ae6e0e 100644
--- a/python/samba/tests/blackbox/mdsearch.py
+++ b/python/samba/tests/blackbox/mdsearch.py
@@ -123,7 +123,7 @@ class MdfindBlackboxTests(BlackboxTestCase):
         self.server.json_in = json_in.replace("%BASEPATH%", self.sharepath)
         self.server.json_out = json_out.replace("%BASEPATH%", self.sharepath)
 
-        output = self.check_output("mdsearch -s %s -U %s%%%s fileserver spotlight '*==\"samba*\"'" % (config, username, password))
+        output = self.check_output("mdsearch --configfile=%s -U %s%%%s fileserver spotlight '*==\"samba*\"'" % (config, username, password))
 
         actual = output.decode('utf-8').splitlines()
         expected = ["%s/%s" % (self.sharepath, file) for file in testfiles]
diff --git a/python/samba/tests/docs.py b/python/samba/tests/docs.py
index 135be830521..995b8e09978 100644
--- a/python/samba/tests/docs.py
+++ b/python/samba/tests/docs.py
@@ -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()
diff --git a/python/samba/tests/domain_backup_offline.py b/python/samba/tests/domain_backup_offline.py
index 23300ac91b7..4ba1249e81b 100644
--- a/python/samba/tests/domain_backup_offline.py
+++ b/python/samba/tests/domain_backup_offline.py
@@ -170,7 +170,7 @@ class DomainBackupOfflineCmp(BlackboxTestCase):
     def backup(self, prov_dir):
         # Run the backup and check we got one backup tar file
         cmd = ("samba-tool domain backup offline --targetdir={prov_dir} "
-               "-s {prov_dir}/etc/smb.conf").format(prov_dir=prov_dir)
+               "--configfile={prov_dir}/etc/smb.conf").format(prov_dir=prov_dir)
         self.check_output(cmd)
 
         tar_files = [fn for fn in os.listdir(prov_dir)