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 <[email protected]> Reviewed-by: Andrew Bartlett <[email protected]>
Roo4L · Apr 28, 2021 · f291b8f · f291b8f
1 parent 86f7bc7
commit f291b8f
Show file tree

Hide file tree

Showing 25 changed files with 93 additions and 81 deletions.
diff --git a/examples/ad-bench/time_group.sh b/examples/ad-bench/time_group.sh
@@ -30,7 +30,7 @@ SERVER=$2
 
 add_group () {
 	GROUP=$1
-	${NET} ads group add "${GROUP}" -k -s $CONFIG_FILE -S ${SERVER} > /dev/null
+	${NET} ads group add "${GROUP}" -k --configfile=$CONFIG_FILE -S ${SERVER} > /dev/null
 	RET=$?
 	if [ $RET -ne 0 ]; then
 		echo "${NET} ads group add returned error: $RET"
@@ -40,7 +40,7 @@ add_group () {
 
 del_group () {
 	GROUP=$1
-	${NET} ads group delete "${GROUP}" -k -s $CONFIG_FILE -S ${SERVER} > /dev/null
+	${NET} ads group delete "${GROUP}" -k --configfile=$CONFIG_FILE -S ${SERVER} > /dev/null
 	RET=$?
 	if [ $RET -ne 0 ]; then
 		echo "${NET} returned error: $RET"
@@ -49,7 +49,7 @@ del_group () {
 }
 
 enum_group () {
-	${NET} ads group -k -s $CONFIG_FILE -S $SERVER > /dev/null
+	${NET} ads group -k --configfile=$CONFIG_FILE -S $SERVER > /dev/null
 	RET=$?
 	if [ $RET -ne 0 ]; then
 		echo "${NET} returned error: $RET"
@@ -59,7 +59,7 @@ enum_group () {
 
 info_group () {
 	GROUP=$1
-	${NET} ads group info "${GROUP}" -k -s $CONFIG_FILE -S ${SERVER} > /dev/null
+	${NET} ads group info "${GROUP}" -k --configfile=$CONFIG_FILE -S ${SERVER} > /dev/null
 	RET=$?
 	if [ $RET -ne 0 ]; then
 		echo "${NET} returned error: $RET"

diff --git a/examples/ad-bench/time_join.sh b/examples/ad-bench/time_join.sh
@@ -29,7 +29,7 @@ NT_DOM=$(get_nt_dom $1)
 
 join_domain () {
 	SERVER=$1
-	${NET} ads join -k -s $CONFIG_FILE -S ${SERVER} > /dev/null
+	${NET} ads join -k --configfile=$CONFIG_FILE -S ${SERVER} > /dev/null
 	RET=$?
 	if [ $RET -ne 0 ]; then
 		echo "${NET} returned error: $RET"
@@ -39,7 +39,7 @@ join_domain () {
 
 leave_domain () {
 	SERVER=$1
-	${NET} ads leave -k -s $CONFIG_FILE -S ${SERVER} > /dev/null
+	${NET} ads leave -k --configfile=$CONFIG_FILE -S ${SERVER} > /dev/null
 	if [ $RET -ne 0 ]; then
 		echo "${NET} returned error: $RET"
 		exit 1

diff --git a/examples/ad-bench/time_ldap.sh b/examples/ad-bench/time_ldap.sh
@@ -11,7 +11,7 @@ NT_DOM=$(get_nt_dom $1)
 SERVER=$2
 
 search_users () {
-	${NET} ads search '(objectCategory=user)' sAMAccountName -k -s $CONFIG_FILE -S ${SERVER} > /dev/null
+	${NET} ads search '(objectCategory=user)' sAMAccountName -k --configfile=$CONFIG_FILE -S ${SERVER} > /dev/null
 	RET=$?
 	if [ $RET -ne 0 ]; then
 		echo "${NET} returned error: $RET"
@@ -20,31 +20,31 @@ search_users () {
 }
 
 search_groups () {
-	${NET} ads search '(objectCategory=group)' sAMAccountName -k -s $CONFIG_FILE -S ${SERVER} > /dev/null
+	${NET} ads search '(objectCategory=group)' sAMAccountName -k --configfile=$CONFIG_FILE -S ${SERVER} > /dev/null
 	if [ $RET -ne 0 ]; then
 		echo "${NET} returned error: $RET"
 		exit 1
 	fi
 }
 
 search_computers () {
-	${NET} ads search '(objectCategory=computer)' sAMAccountName -k -s $CONFIG_FILE -S ${SERVER} > /dev/null
+	${NET} ads search '(objectCategory=computer)' sAMAccountName -k --configfile=$CONFIG_FILE -S ${SERVER} > /dev/null
 	if [ $RET -ne 0 ]; then
 		echo "${NET} returned error: $RET"
 		exit 1
 	fi
 }
 
 search_wildcard () {
-	${NET} ads search '(objectCategory=*)' sAMAccountName -k -s $CONFIG_FILE -S ${SERVER} > /dev/null
+	${NET} ads search '(objectCategory=*)' sAMAccountName -k --configfile=$CONFIG_FILE -S ${SERVER} > /dev/null
 	if [ $RET -ne 0 ]; then
 		echo "${NET} returned error: $RET"
 		exit 1
 	fi
 }
 
 search_unindexed () {
-	${NET} ads search '(description=Built-in account for adminstering the computer/domain)' sAMAccountName -k -s $CONFIG_FILE -S ${SERVER} > /dev/null
+	${NET} ads search '(description=Built-in account for adminstering the computer/domain)' sAMAccountName -k --configfile=$CONFIG_FILE -S ${SERVER} > /dev/null
 	if [ $RET -ne 0 ]; then
 		echo "${NET} returned error: $RET"
 		exit 1

diff --git a/examples/ad-bench/time_user.sh b/examples/ad-bench/time_user.sh
@@ -30,7 +30,7 @@ SERVER=$2
 
 add_user () {
 	USER=$1
-	${NET} ads user add "${USER}" 'Sup3rS3cr3T!' -k -s $CONFIG_FILE -S ${SERVER} > /dev/null
+	${NET} ads user add "${USER}" 'Sup3rS3cr3T!' -k --configfile=$CONFIG_FILE -S ${SERVER} > /dev/null
 	RET=$?
 	if [ $RET -ne 0 ]; then
 		echo "${NET} ads user add returned error: $RET"
@@ -40,7 +40,7 @@ add_user () {
 
 del_user () {
 	USER=$1
-	${NET} ads user delete "${USER}" -k -s $CONFIG_FILE -S ${SERVER} > /dev/null
+	${NET} ads user delete "${USER}" -k --configfile=$CONFIG_FILE -S ${SERVER} > /dev/null
 	RET=$?
 	if [ $RET -ne 0 ]; then
 		echo "${NET} returned error: $RET"
@@ -49,7 +49,7 @@ del_user () {
 }
 
 enum_user () {
-	${NET} ads user -k -s $CONFIG_FILE -S $SERVER > /dev/null
+	${NET} ads user -k --configfile=$CONFIG_FILE -S $SERVER > /dev/null
 	RET=$?
 	if [ $RET -ne 0 ]; then
 		echo "${NET} returned error: $RET"
@@ -59,7 +59,7 @@ enum_user () {
 
 info_user () {
 	USER=$1
-	${NET} ads user info "${USER}" -k -s $CONFIG_FILE -S ${SERVER} > /dev/null
+	${NET} ads user info "${USER}" -k --configfile=$CONFIG_FILE -S ${SERVER} > /dev/null
 	RET=$?
 	if [ $RET -ne 0 ]; then
 		echo "${NET} returned error: $RET"

diff --git a/nsswitch/tests/test_wbinfo_user_info_cached.sh b/nsswitch/tests/test_wbinfo_user_info_cached.sh
@@ -22,7 +22,7 @@ failed=0
 
 samba_bindir="$BINDIR"
 wbinfo_tool="$VALGRIND $samba_bindir/wbinfo"
-net_tool="$VALGRIND $samba_bindir/net -s $SERVERCONFFILE"
+net_tool="$VALGRIND $samba_bindir/net --configfile=$SERVERCONFFILE"
 
 . $(dirname $0)/../../testprogs/blackbox/subunit.sh
 

diff --git a/python/samba/tests/blackbox/mdsearch.py b/python/samba/tests/blackbox/mdsearch.py
@@ -123,7 +123,7 @@ def test_mdsearch(self):
         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
@@ -310,8 +310,11 @@ def _test_default(self, program):
                 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 @@ def _set_defaults(self, program):
                 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 @@ def _set_arbitrary(self, program, exceptions=None):
                 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 @@ def _test_empty(self, program):
         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
@@ -170,7 +170,7 @@ def provision(self, backend):
     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)

diff --git a/selftest/target/Samba3.pm b/selftest/target/Samba3.pm
@@ -1843,7 +1843,7 @@ sub make_bin_cmd
 		@preargs = split(/ /, $valgrind);
 	}
 	my @args = ("-F", "--no-process-group",
-		    "-s", $env_vars->{SERVERCONFFILE},
+		    "--configfile=$env_vars->{SERVERCONFFILE}",
 		    "-l", $env_vars->{LOGDIR});
 
 	if (not defined($dont_log_stdout)) {
@@ -3058,7 +3058,7 @@ force_user:x:$gid_force_user:
 	$ret{SMBD_TEST_LOG_POS} = 0;
 	$ret{SERVERCONFFILE} = $conffile;
 	$ret{TESTENV_DIR} = $prefix_abs;
-	$ret{CONFIGURATION} ="-s $conffile";
+	$ret{CONFIGURATION} ="--configfile=$conffile";
 	$ret{LOCK_DIR} = $lockdir;
 	$ret{SERVER} = $server;
 	$ret{USERNAME} = $unix_name;

diff --git a/selftest/target/Samba4.pm b/selftest/target/Samba4.pm
@@ -607,10 +607,10 @@ sub provision_raw_prepare($$$$$$$$$$$$$$)
 	$ctx->{nsswrap_hostname} = "$ctx->{hostname}.$ctx->{dnsname}";
 	if ($ENV{SAMBA_DNS_FAKING}) {
 		$ctx->{dns_host_file} = "$ENV{SELFTEST_PREFIX}/dns_host_file";
-		$ctx->{samba_dnsupdate} = "$ENV{SRCDIR_ABS}/source4/scripting/bin/samba_dnsupdate -s $ctx->{smb_conf} --all-interfaces --use-file=$ctx->{dns_host_file}";
+		$ctx->{samba_dnsupdate} = "$ENV{SRCDIR_ABS}/source4/scripting/bin/samba_dnsupdate --configfile=$ctx->{smb_conf} --all-interfaces --use-file=$ctx->{dns_host_file}";
 		$ctx->{samba_dnsupdate} = $python_cmd .  $ctx->{samba_dnsupdate};
 	} else {
-	        $ctx->{samba_dnsupdate} = "$ENV{SRCDIR_ABS}/source4/scripting/bin/samba_dnsupdate -s $ctx->{smb_conf} --all-interfaces";
+	        $ctx->{samba_dnsupdate} = "$ENV{SRCDIR_ABS}/source4/scripting/bin/samba_dnsupdate --configfile=$ctx->{smb_conf} --all-interfaces";
 		$ctx->{samba_dnsupdate} = $python_cmd .  $ctx->{samba_dnsupdate};
 		$ctx->{use_resolv_wrapper} = 1;
 	}
@@ -782,8 +782,8 @@ sub provision_raw_step1($$)
 	server min protocol = SMB2_02
 	mangled names = yes
 	dns update command = $ctx->{samba_dnsupdate}
-	spn update command = $ctx->{python} $ENV{SRCDIR_ABS}/source4/scripting/bin/samba_spnupdate -s $ctx->{smb_conf}
-	gpo update command = $ctx->{python} $ENV{SRCDIR_ABS}/source4/scripting/bin/samba-gpupdate -s $ctx->{smb_conf} --target=Computer
+	spn update command = $ctx->{python} $ENV{SRCDIR_ABS}/source4/scripting/bin/samba_spnupdate --configfile $ctx->{smb_conf}
+	gpo update command = $ctx->{python} $ENV{SRCDIR_ABS}/source4/scripting/bin/samba-gpupdate --configfile $ctx->{smb_conf} --target=Computer
 	samba kcc command = $ctx->{python} $ENV{SRCDIR_ABS}/source4/scripting/bin/samba_kcc
 	dreplsrv:periodic_startup_interval = 0
 	dsdb:schema update allowed = yes
@@ -3250,7 +3250,7 @@ sub setup_offlinebackupdc
 
 	# create an offline backup of the 'backupfromdc' target
 	my $backupdir = File::Temp->newdir();
-	my $cmd = "offline -s $dcvars->{SERVERCONFFILE}";
+	my $cmd = "offline --configfile $dcvars->{SERVERCONFFILE}";
 	my $backup_file = $self->create_backup($env, $dcvars,
 					       $backupdir, $cmd);
 

diff --git a/source4/setup/tests/blackbox_s3upgrade.sh b/source4/setup/tests/blackbox_s3upgrade.sh
@@ -40,7 +40,7 @@ cat - > $PREFIX/samba3-upgrade/samba3/smb1.conf <<EOF
 EOF
 
 testit "samba3-upgrade-member" $PYTHON $samba_tool domain classicupgrade $PREFIX/samba3-upgrade/samba3/smb1.conf --targetdir=$PREFIX/samba3-upgrade/s4_1 --dbdir=$PREFIX/samba3-upgrade/samba3 --use-ntvfs
-testit "samba3-upgrade-member-getlocalsid" $samba_net getlocalsid s3upgrade -s $PREFIX/samba3-upgrade/s4_1/etc/smb.conf
+testit "samba3-upgrade-member-getlocalsid" $samba_net getlocalsid s3upgrade --configfile=$PREFIX/samba3-upgrade/s4_1/etc/smb.conf
 
 # Test 2 (s3 dc)
 cat - > $PREFIX/samba3-upgrade/samba3/smb2.conf <<EOF
@@ -65,8 +65,8 @@ mv $PREFIX/samba3-upgrade/samba3/wins.dat2 $PREFIX/samba3-upgrade/samba3/wins.da
 
 # Upgrade NT4-like domains in samba3upgrade
 testit "samba3-upgrade-dc" $PYTHON $samba_tool domain classicupgrade $PREFIX/samba3-upgrade/samba3/smb2.conf --targetdir=$PREFIX/samba3-upgrade/s4_2 --dbdir=$PREFIX/samba3-upgrade/samba3 --use-ntvfs
-testit "samba3-upgrade-dc-getlocalsid" $samba_net getlocalsid samba -s $PREFIX/samba3-upgrade/s4_2/etc/smb.conf
-testit "samba3-upgrade-dc-getdomainsid" $samba_net getdomainsid -s $PREFIX/samba3-upgrade/s4_2/etc/smb.conf
+testit "samba3-upgrade-dc-getlocalsid" $samba_net getlocalsid samba --configfile=$PREFIX/samba3-upgrade/s4_2/etc/smb.conf
+testit "samba3-upgrade-dc-getdomainsid" $samba_net getdomainsid --configfile=$PREFIX/samba3-upgrade/s4_2/etc/smb.conf
 
 #Run final test without a wins.dat
 rm -f $PREFIX/samba3-upgrade/samba3/wins.dat
@@ -91,8 +91,8 @@ cat - > $PREFIX/samba3-upgrade/samba3/smb3.conf <<EOF
 EOF
 
 testit "samba3-upgrade-testparm" $PYTHON $samba_tool domain classicupgrade $PREFIX/samba3-upgrade/samba3/smb2.conf --targetdir=$PREFIX/samba3-upgrade/s4_3 --testparm=$testparm --use-ntvfs
-testit "samba3-upgrade-testparm-getlocalsid" $samba_net getlocalsid samba -s $PREFIX/samba3-upgrade/s4_3/etc/smb.conf
-testit "samba3-upgrade-testparm-getdomainsid" $samba_net getdomainsid -s $PREFIX/samba3-upgrade/s4_3/etc/smb.conf
+testit "samba3-upgrade-testparm-getlocalsid" $samba_net getlocalsid samba --configfile=$PREFIX/samba3-upgrade/s4_3/etc/smb.conf
+testit "samba3-upgrade-testparm-getdomainsid" $samba_net getdomainsid --configfile=$PREFIX/samba3-upgrade/s4_3/etc/smb.conf
 
 rm -rf $PREFIX/samba3-upgrade
 

diff --git a/source4/setup/tests/blackbox_start_backup.sh b/source4/setup/tests/blackbox_start_backup.sh
@@ -56,7 +56,7 @@ start_backup()
     OPTS="$OPTS --debug-stderr"
 
     # start samba and capture the debug output
-    OUTPUT=$($BINDIR/samba -s $DBPATH/etc/smb.conf $OPTS 2>&1)
+    OUTPUT=$($BINDIR/samba --configfile=$DBPATH/etc/smb.conf $OPTS 2>&1)
     if [ $? -eq 0 ] ; then
         echo "ERROR: Samba should not have started successfully"
         return 1

diff --git a/source4/setup/tests/blackbox_upgradeprovision.sh b/source4/setup/tests/blackbox_upgradeprovision.sh
@@ -26,15 +26,15 @@ upgradeprovision() {
     rm -fr $PREFIX/upgradeprovision
   fi
 	$PYTHON $BINDIR/samba-tool domain provision --host-name=bar --domain=FOO --realm=foo.example.com --targetdir="$PREFIX/upgradeprovision" --server-role="dc" --use-ntvfs --base-schema=2008_R2
-	$PYTHON $BINDIR/samba_upgradeprovision -s "$PREFIX/upgradeprovision/etc/smb.conf" --debugchange
+	$PYTHON $BINDIR/samba_upgradeprovision --configfile="$PREFIX/upgradeprovision/etc/smb.conf" --debugchange
 }
 
 upgradeprovision_full() {
   if [ -d $PREFIX/upgradeprovision_full ]; then
     rm -fr $PREFIX/upgradeprovision_full
   fi
 	$PYTHON $BINDIR/samba-tool domain provision --host-name=bar --domain=FOO --realm=foo.example.com --targetdir="$PREFIX/upgradeprovision_full" --server-role="dc" --use-ntvfs --base-schema=2008_R2
-	$PYTHON $BINDIR/samba_upgradeprovision -s "$PREFIX/upgradeprovision_full/etc/smb.conf" --full --debugchange
+	$PYTHON $BINDIR/samba_upgradeprovision --configfile="$PREFIX/upgradeprovision_full/etc/smb.conf" --full --debugchange
 }
 
 # The ldapcmp runs here are to ensure that a 'null' run of

diff --git a/source4/torture/drs/python/ridalloc_exop.py b/source4/torture/drs/python/ridalloc_exop.py
@@ -293,7 +293,7 @@ def test_offline_samba_tool_seized_ridalloc(self):
 
             self.assertFalse("rIDSetReferences" in res[0])
 
-            (result, out, err) = self.runsubcmd("fsmo", "seize", "--role", "rid", "-H", ldb_url, "-s", smbconf, "--force")
+            (result, out, err) = self.runsubcmd("fsmo", "seize", "--role", "rid", "-H", ldb_url, "--configfile=%s" % (smbconf), "--force")
             self.assertCmdSuccess(result, out, err)
             self.assertEqual(err, "", "Shouldn't be any error messages")
 
@@ -621,7 +621,7 @@ def test_rid_set_dbcheck_after_seize(self):
             self.assertTrue("rIDSetReferences" in res[0])
             rid_set_dn = ldb.Dn(new_ldb, res[0]["rIDSetReferences"][0].decode('utf8'))
             # 4. Seize the RID Manager role
-            (result, out, err) = self.runsubcmd("fsmo", "seize", "--role", "rid", "-H", ldb_url, "-s", smbconf, "--force")
+            (result, out, err) = self.runsubcmd("fsmo", "seize", "--role", "rid", "-H", ldb_url, "--configfile=%s" % (smbconf), "--force")
             self.assertCmdSuccess(result, out, err)
             self.assertEqual(err, "", "Shouldn't be any error messages")
 

diff --git a/source4/torture/drs/python/samba_tool_drs.py b/source4/torture/drs/python/samba_tool_drs.py
@@ -203,7 +203,7 @@ def get_num_obj_links(output):
 
         new_dc_config_file = "%s/etc/smb.conf" % self.tempdir
 
-        self.check_output("samba-tool drs replicate --local %s %s %s %s -s %s"
+        self.check_output("samba-tool drs replicate --local %s %s %s %s --configfile=%s"
                           % ("invalid", self.dc1, nc_name,
                              self.cmdline_creds, new_dc_config_file))
 
@@ -227,7 +227,7 @@ def get_num_obj_links(output):
         self._net_drs_replicate(DC=self.dnsname_dc2, fromDC=self.dnsname_dc1)
 
         # pull that change with --local into local db from dc1: should send link and some objects
-        out = self.check_output("samba-tool drs replicate --local %s %s %s %s -s %s"
+        out = self.check_output("samba-tool drs replicate --local %s %s %s %s --configfile=%s"
                                 % ("invalid", self.dc1, nc_name,
                                    self.cmdline_creds, new_dc_config_file))
 
@@ -238,7 +238,7 @@ def get_num_obj_links(output):
 
         # pull that change with --local into local db from dc2: shouldn't send link or object
         # as we sent an up-to-dateness vector showing that we had already synced with DC1
-        out = self.check_output("samba-tool drs replicate --local %s %s %s %s -s %s"
+        out = self.check_output("samba-tool drs replicate --local %s %s %s %s --configfile=%s"
                                 % ("invalid", self.dc2, nc_name,
                                    self.cmdline_creds, new_dc_config_file))
 
@@ -247,7 +247,7 @@ def get_num_obj_links(output):
         self.assertEqual(obj_2, 0)
         self.assertEqual(link_2, 0)
 
-        self.check_output("samba-tool domain demote --remove-other-dead-server=%s -H ldap://%s %s -s %s"
+        self.check_output("samba-tool domain demote --remove-other-dead-server=%s -H ldap://%s %s --configfile=%s"
                           % (netbiosname, self.dc1, self.cmdline_creds, new_dc_config_file))
 
     def test_samba_tool_replicate_machine_creds_P(self):