selftest: rename schemaupgrade_dc (+pair) to schema_dc

This is needed because the name of the autobuild job and
the name of the selftest env end up in the socket path
for ncalrpc sockets.

The challenge is that (for example)
/memdisk/autobuild/fl/b2424063/samba-schemaupgrade/bin/ab/schemaupgrade_pair_dc/ncalrpc/np/protected_storage
does not fit in a struct sockaddr_un.

Signed-off-by: Garming Sam <garming@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>

Autobuild-User(master): Andrew Bartlett <abartlet@samba.org>
Autobuild-Date(master): Fri Apr 12 05:41:36 UTC 2019 on sn-devel-144

2 files changed, 8 insertions, 8 deletions

diff --git a/selftest/target/README b/selftest/target/README
index acdbb421d27..81d744759e6 100644
--- a/selftest/target/README
+++ b/selftest/target/README
@@ -129,9 +129,9 @@ allowed processes artificially low, to test that new connections are refused
 correctly.  Due to the limited number of connections accepted, it's not
 recommended to use this testenv for anything else.
 
-schemaupgrade_dc
+schema_dc
 ----------------
-This is a 2-DC testenv setup (schemaupgrade_dc and schemaupgrade_pair_dc).
+This is a 2-DC testenv setup (schema_dc and schema_pair_dc).
 We provision the first DC, and join the second, using an older version of the
 schema (2008R2), then start-up Samba. Then, we run a schema upgrade (i.e.
 'samba-tool domain schemaupgrade') on the PDC.
diff --git a/selftest/target/Samba4.pm b/selftest/target/Samba4.pm
index 7c1671d4007..6f4a31d357a 100755
--- a/selftest/target/Samba4.pm
+++ b/selftest/target/Samba4.pm
@@ -2267,14 +2267,14 @@ sub check_env($$)
 	ad_dc_slowtests      => ["ad_dc_ntvfs"],
 	ad_dc_backup         => ["ad_dc"],
 
-	schemaupgrade_dc      => ["dns_hub"],
-	schemaupgrade_pair_dc => ["schemaupgrade_dc"],
+	schema_dc      => ["dns_hub"],
+	schema_pair_dc => ["schema_dc"],
 
 	none                 => [],
 );
 
 %Samba4::ENV_DEPS_POST = (
-	schemaupgrade_dc => ["schemaupgrade_pair_dc"],
+	schema_dc => ["schema_pair_dc"],
 );
 
 sub return_alias_env
@@ -2791,7 +2791,7 @@ sub setup_proclimitdc
 }
 
 # Used to test a live upgrade of the schema on a 2 DC network.
-sub setup_schemaupgrade_dc
+sub setup_schema_dc
 {
 	my ($self, $path) = @_;
 
@@ -2819,9 +2819,9 @@ sub setup_schemaupgrade_dc
 }
 
 # the second DC in the live schema upgrade pair
-sub setup_schemaupgrade_pair_dc
+sub setup_schema_pair_dc
 {
-	# note: dcvars contains the env info for the dependent testenv ('schemaupgrade_dc')
+	# note: dcvars contains the env info for the dependent testenv ('schema_dc')
 	my ($self, $prefix, $dcvars) = @_;
 	print "Preparing SCHEMA UPGRADE PAIR DC...\n";