diff options
| author | Tim Beale <timbeale@catalyst.net.nz> | 2019-02-26 10:17:21 +1300 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2019-03-04 21:41:16 +0000 |
| commit | 25544e101b0282d0f932f9e7c7eda66a270751fd (patch) | |
| tree | fdd3970bfda3ae05ba323ae86b8c97c902cb342b /source4/selftest | |
| parent | 3ce28f918cedaf37b4ebc7b80d243030b41c20bb (diff) | |
| download | samba-25544e101b0282d0f932f9e7c7eda66a270751fd.tar.gz | |
s4:tests: Avoid passing unnecessary env variables to auth_log tests
These tests all use the ncalrpc connection, so they're always testing a
connection that's local to the server-side. Therefore passing in the
CLIENT_IP and SOCKET_WRAPPER_DEFAULT_IFACE variables (in order to try to
simulate a client connecting) is unnecessary.
Signed-off-by: Tim Beale <timbeale@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Diffstat (limited to 'source4/selftest')
| -rwxr-xr-x | source4/selftest/tests.py | 28 |
1 files changed, 10 insertions, 18 deletions
diff --git a/source4/selftest/tests.py b/source4/selftest/tests.py index e83bbacfd90..0ec2fcbc617 100755 --- a/source4/selftest/tests.py +++ b/source4/selftest/tests.py @@ -724,34 +724,26 @@ if have_heimdal_support: planoldpythontestsuite("ad_dc_ntvfs:local", "samba.tests.auth_log_pass_change", extra_args=['-U"$USERNAME%$PASSWORD"'], environ={'CLIENT_IP': '127.0.0.11', 'SOCKET_WRAPPER_DEFAULT_IFACE': 11}) + + # these tests use a NCA local RPC connection, so always run on the + # :local testenv, and so don't need to fake a client connection planoldpythontestsuite("ad_dc_ntvfs:local", "samba.tests.auth_log_ncalrpc", extra_args=['-U"$USERNAME%$PASSWORD"']) planoldpythontestsuite("ad_dc:local", "samba.tests.auth_log_ncalrpc", extra_args=['-U"$USERNAME%$PASSWORD"']) planoldpythontestsuite("ad_dc:local", "samba.tests.auth_log_samlogon", - extra_args=['-U"$USERNAME%$PASSWORD"'], - environ={'CLIENT_IP': '127.0.0.11', - 'SOCKET_WRAPPER_DEFAULT_IFACE': 11}) + extra_args=['-U"$USERNAME%$PASSWORD"']) planoldpythontestsuite("ad_dc_ntvfs:local", "samba.tests.auth_log_samlogon", - extra_args=['-U"$USERNAME%$PASSWORD"'], - environ={'CLIENT_IP': '127.0.0.11', - 'SOCKET_WRAPPER_DEFAULT_IFACE': 11}) + extra_args=['-U"$USERNAME%$PASSWORD"']) planoldpythontestsuite("ad_dc:local", "samba.tests.auth_log_netlogon", - extra_args=['-U"$USERNAME%$PASSWORD"'], - environ={'CLIENT_IP': '127.0.0.11', - 'SOCKET_WRAPPER_DEFAULT_IFACE': 11}) + extra_args=['-U"$USERNAME%$PASSWORD"']) planoldpythontestsuite("ad_dc_ntvfs:local", "samba.tests.auth_log_netlogon", - extra_args=['-U"$USERNAME%$PASSWORD"'], - environ={'CLIENT_IP': '127.0.0.11', - 'SOCKET_WRAPPER_DEFAULT_IFACE': 11}) + extra_args=['-U"$USERNAME%$PASSWORD"']) planoldpythontestsuite("ad_dc:local", "samba.tests.auth_log_netlogon_bad_creds", - extra_args=['-U"$USERNAME%$PASSWORD"'], - environ={'CLIENT_IP': '127.0.0.11', - 'SOCKET_WRAPPER_DEFAULT_IFACE': 11}) + extra_args=['-U"$USERNAME%$PASSWORD"']) planoldpythontestsuite("ad_dc_ntvfs:local", "samba.tests.auth_log_netlogon_bad_creds", - extra_args=['-U"$USERNAME%$PASSWORD"'], - environ={'CLIENT_IP': '127.0.0.11', - 'SOCKET_WRAPPER_DEFAULT_IFACE': 11}) + extra_args=['-U"$USERNAME%$PASSWORD"']) + planoldpythontestsuite("ad_member:local", "samba.tests.auth_log_winbind", extra_args=['-U"$DC_USERNAME%$DC_PASSWORD"'], |