diff options
| author | Tim Beale <timbeale@catalyst.net.nz> | 2019-02-26 11:10:46 +1300 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2019-03-04 21:41:17 +0000 |
| commit | a7d09580ae0e03568b6708cf91d4609a881b0a14 (patch) | |
| tree | aa606ed7918834d66af7241283a69aa9651ee6ef /source4/selftest | |
| parent | c185bf1dcf84b2f86af2b79190a479dbc61b3cd3 (diff) | |
| download | samba-a7d09580ae0e03568b6708cf91d4609a881b0a14.tar.gz | |
tests: Work auth_log CLIENT_IP out from config instead of env var
Instead of passing the CLIENT_IP to the auth_log tests, we can just
work out the source-IP that the client will use from its smb.conf file.
This only works for auth_log_pass_change, but not auth_log.py - the
latter still needs to be run on the :local testenv for other reasons, so
it doesn't use the client.conf. However, we can still update the base
code to use the client.conf IP, as auth_log.py overrides
self.remoteAddress anyway.
The main advantage of this change is it avoids having hardcoded IP
addresses in the selftest framework.
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 | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source4/selftest/tests.py b/source4/selftest/tests.py index 7197a3b4b64..f1650874104 100755 --- a/source4/selftest/tests.py +++ b/source4/selftest/tests.py @@ -718,10 +718,10 @@ if have_heimdal_support: planoldpythontestsuite("ad_dc_ntvfs:local", "samba.tests.auth_log", extra_args=['-U"$USERNAME%$PASSWORD"'], environ={'CLIENT_IP': '127.0.0.11', 'SOCKET_WRAPPER_DEFAULT_IFACE': 11}) - planoldpythontestsuite("ad_dc", "samba.tests.auth_log_pass_change", extra_args=['-U"$USERNAME%$PASSWORD"'], - environ={'CLIENT_IP': '127.0.0.11'}) - planoldpythontestsuite("ad_dc_ntvfs", "samba.tests.auth_log_pass_change", extra_args=['-U"$USERNAME%$PASSWORD"'], - environ={'CLIENT_IP': '127.0.0.11'}) + planoldpythontestsuite("ad_dc", "samba.tests.auth_log_pass_change", + extra_args=['-U"$USERNAME%$PASSWORD"']) + planoldpythontestsuite("ad_dc_ntvfs", "samba.tests.auth_log_pass_change", + extra_args=['-U"$USERNAME%$PASSWORD"']) # 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 |