From: Tim Beale <timbeale@catalyst.net.nz>
Date: Wed, 30 Jan 2019 23:45:31 +0000 (+1300)
Subject: selftest: Convert backup/restore testenvs to use default
X-Git-Tag: ldb-1.6.1~255
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d29853ab0a9754031c8463a593a11fb7bc800cc3;p=thirdparty%2Fsamba.git

selftest: Convert backup/restore testenvs to use default

These testenvs shouldn't be dependent on the process model at all, so we
should be able to convert them to the new default without any
repercussions.

Signed-off-by: Tim Beale <timbeale@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
---

diff --git a/selftest/target/Samba4.pm b/selftest/target/Samba4.pm
index b4f3cab3abf..ea9d09938fe 100755
--- a/selftest/target/Samba4.pm
+++ b/selftest/target/Samba4.pm
@@ -2894,7 +2894,7 @@ sub setup_backupfromdc
 		return undef;
 	}
 
-	if (not defined($self->check_or_start($env, "standard"))) {
+	if (not defined($self->check_or_start($env))) {
 	    return undef;
 	}
 
@@ -3104,7 +3104,7 @@ sub setup_restoredc
 	}
 
 	# start samba for the restored DC
-	if (not defined($self->check_or_start($env, "standard"))) {
+	if (not defined($self->check_or_start($env))) {
 	    return undef;
 	}
 
@@ -3146,7 +3146,7 @@ sub setup_renamedc
 	}
 
 	# start samba for the restored DC
-	if (not defined($self->check_or_start($env, "standard"))) {
+	if (not defined($self->check_or_start($env))) {
 	    return undef;
 	}
 
@@ -3195,7 +3195,7 @@ sub setup_offlinebackupdc
 	Samba::mk_krb5_conf($ctx);
 
 	# start samba for the restored DC
-	if (not defined($self->check_or_start($env, "standard"))) {
+	if (not defined($self->check_or_start($env))) {
 	    return undef;
 	}
 
@@ -3250,7 +3250,7 @@ sub setup_labdc
 	}
 
 	# start samba for the restored DC
-	if (not defined($self->check_or_start($env, "standard"))) {
+	if (not defined($self->check_or_start($env))) {
 	    return undef;
 	}
 
@@ -3348,7 +3348,7 @@ sub setup_customdc
 	Samba::mk_krb5_conf($ctx);
 
 	# start samba for the restored DC
-	if (not defined($self->check_or_start($env, "standard"))) {
+	if (not defined($self->check_or_start($env))) {
 	    return undef;
 	}