Jeremy McMillan
3574698a70
ip_address does not need str() and parse_host_port handles ipv6 or ipv4
...
note:
@isbm requested ip_address objects stay ip_address. They implement __str__
so they should work without explicit str() conversion if necessary.
2019-01-15 16:31:35 +00:00
Jeremy McMillan
7a6bc576d1
avoid TypeError by not constructing an ip_address from an ip_address
2019-01-15 16:31:35 +00:00
Jeremy McMillan
35410dde5c
try to debug error in tests (revert me)
...
Error Message
object of type 'NoneType' has no len()
Stacktrace
Traceback (most recent call last):
File "/tmp/kitchen/testing/tests/unit/utils/test_network.py", line 225, in test_parse_host_port
host, port = network.parse_host_port(host_port)
File "/tmp/kitchen/testing/salt/utils/network.py", line 1957, in parse_host_port
raise _e_
TypeError: object of type 'NoneType' has no len()
2019-01-15 16:31:35 +00:00
Jeremy McMillan
2f8ca47549
wordsmithing
2019-01-15 16:31:35 +00:00
Jeremy McMillan
1dd1f7dd86
parsing logic error
2019-01-15 16:31:35 +00:00
Jeremy McMillan
98041c1158
minimize diff
2019-01-15 16:31:35 +00:00
Jeremy McMillan
c92a24752c
don't try to handle/log test exception
2019-01-15 16:31:35 +00:00
Jeremy McMillan
eb605867c6
remove bad extra test assertion inside exception handler
2019-01-15 16:31:35 +00:00
Jeremy McMillan
e1e5d874ba
checking for truthiness better than len
2019-01-15 16:31:35 +00:00
Jeremy McMillan
a984a43995
typo in ipaddress.IPv6Address()
2019-01-15 16:31:35 +00:00
Jeremy McMillan
5fc6c602c2
clear up lint, disambiguation
2019-01-15 16:31:35 +00:00
Jeremy McMillan
8c6dfea8eb
lint pep8 whitespace
2019-01-15 16:31:35 +00:00
Jeremy McMillan
f9594b8a1f
don't test invalid combination
2019-01-15 16:31:35 +00:00
Jeremy McMillan
de823fd3ae
fix good_host_ports iteration
2019-01-15 16:31:35 +00:00
Jeremy McMillan
c5a5b34fc4
test assertion correction
2019-01-15 16:31:35 +00:00
Jeremy McMillan
e169e0df54
fixup rebase merge goof
2019-01-15 16:31:35 +00:00
Jeremy McMillan
d28bab6fd0
fix test setup
2019-01-15 16:31:35 +00:00
Jeremy McMillan
42c710e4d1
lint pep8
2019-01-15 16:31:35 +00:00
Jeremy McMillan
15c6deba62
fix horrible mistakes
2019-01-15 16:31:35 +00:00
Jeremy McMillan
c092baf9da
fix indentation doh
2019-01-15 16:31:35 +00:00
Jeremy McMillan
9080745e3a
debug ipaddress.ip_address TypeError
2019-01-15 16:31:35 +00:00
Jeremy McMillan
8bd82f44e4
debug ipaddress.ip_address TypeError
2019-01-15 16:31:35 +00:00
Jeremy McMillan
080ab702c1
fix parse_host_port() parse error on hostname only arg
2019-01-15 16:31:35 +00:00
Jeremy McMillan
571603c4ce
coverage for master host:port ipv4 and ipv6 config value support
...
fix test_parse_host_port bad values
lint
2019-01-15 16:31:35 +00:00
Jeremy McMillan
f14ff16626
fix minion zmq connecting to master configured as IPv6 address
2019-01-15 16:31:35 +00:00
Jeremy McMillan
9d72f13cac
pylint E741 triggers error in salt-pylint E8741 (unhandled)
2019-01-15 16:31:35 +00:00
Jeremy McMillan
2052838a4d
avoid error on (redundant) is_ip check
2019-01-15 16:31:35 +00:00
Jeremy McMillan
0eaeb1ed13
avoid error on (redundant) is_ip check
2019-01-15 16:31:35 +00:00
Jeremy McMillan
f8bd08e6f2
fix parse_host_port() is_ip call
2019-01-15 16:31:35 +00:00
Jeremy McMillan
89519fea0b
fix parse_host_port() parse error on hostname only arg
2019-01-15 16:31:35 +00:00
Jeremy McMillan
1417528f57
fix parse_host_port() bad exception on hostname only arg
2019-01-15 16:31:35 +00:00
Jeremy McMillan
194a024ed0
coverage for master host:port ipv4 and ipv6 config value support
...
fix test_parse_host_port bad values
lint
2019-01-15 16:31:35 +00:00
Jeremy McMillan
df7338809b
fix minion zmq connecting to master configured as IPv6 address
2019-01-15 16:31:35 +00:00
Erik Johnson
a3c0b49b64
Fix poorly-written test
...
This test was confirming the incorrect prior behavior.
2019-01-15 05:56:40 -06:00
Shane Lee
05836b3948
Merge branch '2018.3' into issue51158
2019-01-14 20:06:02 -07:00
Daniel A. Wozniak
11cc7b33d4
Remove un-needed test
2019-01-14 20:00:09 -07:00
Daniel A. Wozniak
0f87812aff
Merge develop, Revert exception handling
2019-01-14 19:50:16 -07:00
Daniel A. Wozniak
7365a1a8ec
Pass bytes to idna
2019-01-14 19:10:23 -07:00
Daniel Wozniak
06854cf541
Merge pull request #51147 from Ch3LL/merge-2018.3
...
[2018.3] Merge forward from 2017.7 to 2018.3
2019-01-14 19:05:50 -07:00
jpsv
055823ed28
Update opsgenie.py
...
Added back "action_type" for test parameter to satisfy Python linting.
2019-01-14 18:56:13 -05:00
jpsv
501c8dff9c
Merge branch '2018.3' into 2018.3
2019-01-14 18:51:01 -05:00
jpsv
220aa8afff
Update opsgenie.py
2019-01-14 18:50:20 -05:00
jpsv
5dc21ccf3c
Update to from V1 API to V2
...
Mainly removed test for action_type
2019-01-14 18:39:16 -05:00
jpsv
f93ce7ca0c
Update to V2 API
...
* Added if/else block for creating or closing an alert
* Removed test for "action_type"
2019-01-14 18:38:09 -05:00
Daniel A. Wozniak
bf47f6f806
Fix linter
2019-01-14 16:02:03 -07:00
Gareth J. Greenaway
d39d8b720d
Merge branch '2018.3' into merge-2018.3
2019-01-14 14:48:44 -08:00
Gareth J. Greenaway
b79c09e5a3
Merge pull request #51161 from amendlik/long-hostname
...
Ignore exceptions when generating the minion ID
2019-01-14 14:47:54 -08:00
twangboy
6caa93bc5d
Add random sleep time to avoid overloading Windows
2019-01-14 15:06:03 -07:00
Gareth J. Greenaway
6fcc4ad4d5
Merge branch '2018.3' into long-hostname
2019-01-14 13:36:25 -08:00
Daniel A. Wozniak
6223596073
Honor roster file for ssh orchestrations
2019-01-14 14:21:03 -07:00
