From: Tim Beale Date: Mon, 25 Feb 2019 23:14:55 +0000 (+1300) Subject: selftest: Remove secondary client interfaces X-Git-Tag: talloc-2.2.0~100 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a3da2f63be4bff6ca77b7e1e4d45f42dcf177eef;p=thirdparty%2Fsamba.git selftest: Remove secondary client interfaces I can't see anything in the tests that ever tries to use these other IP addresses. While it makes sense that we might want the tests to simulate multiple different clients (with different IPs), we don't appear to do this currently. Removing the spare client addresses minimizes the number of hard-coded IP addresses in selftest. Signed-off-by: Tim Beale Reviewed-by: Andrew Bartlett --- diff --git a/selftest/selftest.pl b/selftest/selftest.pl index 773b28439d4..37e288e456f 100755 --- a/selftest/selftest.pl +++ b/selftest/selftest.pl @@ -511,12 +511,7 @@ foreach (@opt_include) { push (@includes, read_test_regexes($_)); } -my $interfaces = join(',', ("127.0.0.11/8", - "127.0.0.12/8", - "127.0.0.13/8", - "127.0.0.14/8", - "127.0.0.15/8", - "127.0.0.16/8")); +my $interfaces = "127.0.0.11/8"; my $clientdir = "$prefix_abs/client"; diff --git a/selftest/target/Samba.pm b/selftest/target/Samba.pm index 3a2386202a6..2d8cbc28703 100644 --- a/selftest/target/Samba.pm +++ b/selftest/target/Samba.pm @@ -437,9 +437,12 @@ sub get_interface($) localnt4dc9 => 9, # 10 is spare - # 11-16 used by selftest.pl for client interfaces + # 11 is used by selftest.pl for the client interface client => 11, + # 12-16 have been historically reserved for the client, although + # aren't actually used + addc_no_nss => 17, addc_no_ntlm => 18, idmapadmember => 19,