Gareth J. Greenaway
|
6c99cb161f
|
Merge branch '2018.3' into merge-2018.3
Conflicts:
doc/man/salt-api.1
doc/man/salt-call.1
doc/man/salt-cloud.1
doc/man/salt-cp.1
doc/man/salt-key.1
doc/man/salt-master.1
doc/man/salt-minion.1
doc/man/salt-proxy.1
doc/man/salt-run.1
doc/man/salt-ssh.1
doc/man/salt-syndic.1
doc/man/salt-unity.1
doc/man/salt.1
doc/man/salt.7
doc/man/spm.1
pkg/osx/build_env.sh
salt/utils/dns.py
tests/integration/netapi/rest_tornado/test_app.py
tests/support/case.py
tests/unit/utils/test_dns.py
|
2019-02-11 15:45:43 -08:00 |
|
Gareth J. Greenaway
|
84e15cedf9
|
Fixing lint
|
2019-02-11 10:57:08 -08:00 |
|
Gareth J. Greenaway
|
e891b3f515
|
Merge branch '2018.3.4' into merge-2018.3.4
Conflicts:
tests/integration/states/test_file.py
tests/unit/states/test_file.py
tests/unit/utils/test_dns.py
|
2019-02-11 10:46:53 -08:00 |
|
Ty Hahn
|
14e6fb758f
|
In case the test machine can't resolve
With -v option, dig does not attemp to resolve while verifying all the given
options.
|
2019-02-03 23:10:37 +09:00 |
|
Ty Hahn
|
a00d708441
|
Test dig options for salt.utils.dns.lookup
|
2019-02-03 23:01:39 +09:00 |
|
Ty Hahn
|
9a34bcda10
|
Unit test for lookup with servers option
|
2019-01-24 22:14:30 +09:00 |
|
Ty Hahn
|
af867e14dc
|
Remove excessive whitespaces
|
2019-01-24 21:32:46 +09:00 |
|
Ty Hahn
|
0d074a4f2e
|
Fix a comment
|
2019-01-24 21:32:46 +09:00 |
|
Ronald van Zantvoort
|
5cfe201e62
|
utils.dns: much improved TLD screening
|
2018-03-08 16:21:55 +01:00 |
|
Ronald van Zantvoort
|
1f63be3b43
|
moar utils.dns test fixes
|
2018-03-08 14:58:23 +01:00 |
|
Ronald van Zantvoort
|
ee6c483e42
|
utils.dns: test fixes
|
2018-02-27 17:32:56 +01:00 |
|
Ronald van Zantvoort
|
e9446f9bc9
|
utils.dns: testing fix
|
2018-02-27 17:32:56 +01:00 |
|
Ronald van Zantvoort
|
62863a3150
|
utils.dns: test fixes
|
2018-02-27 17:32:56 +01:00 |
|
Ronald van Zantvoort
|
75b8abd3ee
|
utils.dns: cleaner output with only one field in rec
|
2018-02-27 17:32:56 +01:00 |
|
Ronald van Zantvoort
|
4f4f25c91f
|
utils.dns tests: pylint fixes
|
2018-02-27 17:32:55 +01:00 |
|
Ronald van Zantvoort
|
bf9ac458a9
|
utils.dns: pylint fixes
|
2018-02-27 17:32:55 +01:00 |
|
Ronald van Zantvoort
|
50453e0bf4
|
utils.dns: fixes & additions to unit tests
|
2018-02-27 17:32:54 +01:00 |
|
Ronald van Zantvoort
|
875c34ad2e
|
dnstests: Use textwrap to increase legibility
|
2018-02-27 17:32:54 +01:00 |
|
Erik Johnson
|
1044b627a1
|
[PY3] Add unicode_literals to salt.utils modules (A-D)
|
2018-01-13 16:08:56 -06:00 |
|
Ronald van Zantvoort
|
24adf57814
|
DNS2: pylint fixes
|
2017-04-11 14:52:16 +02:00 |
|
Ronald van Zantvoort
|
4e573a93e6
|
DNS2: Add some docs
|
2017-04-11 13:17:51 +02:00 |
|
Ronald van Zantvoort
|
fba643a64f
|
DNS2: Add nslookup tests
|
2017-04-11 13:11:35 +02:00 |
|
Ronald van Zantvoort
|
8e37eab1cb
|
DNS2: Raise ValueError on wrong DNS type plus testing
|
2017-04-11 11:03:19 +02:00 |
|
Ronald van Zantvoort
|
f9d3fbb379
|
DNS2: Re-add DNSSEC test, add tests for host
|
2017-04-11 09:02:53 +02:00 |
|
Ronald van Zantvoort
|
9dff676f8f
|
DNS2: bugfixes, cleanup, drill tests
|
2017-04-06 10:13:01 +02:00 |
|
Ronald van Zantvoort
|
e3239d90cf
|
DNS2: dig lookup testing
|
2017-04-06 10:13:00 +02:00 |
|
Ronald van Zantvoort
|
a30dd2ed0c
|
DNS2: Add tests for getaddrinfo()
|
2017-04-06 10:13:00 +02:00 |
|
Ronald van Zantvoort
|
5a77b2520f
|
DNS2: Add first batch of unit tests
|
2017-04-06 10:13:00 +02:00 |
|