Pedro Algarvio
3000d2095d
Fix tests. We no longer get ipaddress instances back.
2019-01-24 23:15:21 +00:00
twangboy
8fcf235b75
Fix minion start issue
2019-01-24 23:15:21 +00:00
Pedro Algarvio
a26ba7f3aa
Don't fail the test because of order
2019-01-24 23:15:21 +00:00
Gareth J. Greenaway
c847f54293
Swap passed addr for string rather than ipaddress object.
2019-01-24 15:04:27 -08:00
Gareth J. Greenaway
87f3972606
removing another debugging log.
2019-01-24 14:52:31 -08:00
Gareth J. Greenaway
ad64efbabe
Use MagicMock
2019-01-24 14:51:17 -08:00
Gareth J. Greenaway
172ad2e021
removing debugging
2019-01-24 14:50:05 -08:00
Gareth J. Greenaway
5812eae808
Adding a test to ensure dns_check works as expected.
2019-01-24 14:48:41 -08:00
Gareth J. Greenaway
0af4675f8d
Merge pull request #51318 from garethgreenaway/51273_only_allow_auth_valid_parameters
...
[2019.2.0rc1] Fix to __auth_call
2019-01-24 14:27:00 -08:00
Erik Johnson
d9c4462c4e
Fix 500 error when using wheel_async
...
When `wheel_async` is used, the job completes, but for the same reason
we couldn't replace the signal in the first place, we fail to restore it
after control is returned to the context manager.
This fixes this by only adding the signal data to the `old_signals` dict
when we successfully override the signal handling, so that we don't
incorrectly attempt to "restore" the signal later.
2019-01-24 16:23:29 -06:00
Gareth J. Greenaway
3dbe8dc8be
When making auth calls, only username, password, auth, and token are valid, so we strip anything else out.
2019-01-24 12:45:35 -08:00
Pedro Algarvio
138ca2e682
Show objects on assertion failure
2019-01-24 17:02:13 +00:00
Pedro Algarvio
840b3d2103
Add pytest-salt-from-filenames to pytest requirements
2019-01-24 17:02:13 +00:00
Pedro Algarvio
716bda4414
Remove duplicate dependency
2019-01-24 17:02:13 +00:00
Pedro Algarvio
6d62156a11
Add .coveragerc
2019-01-24 17:02:13 +00:00
Pedro Algarvio
6bb56ced2e
Run tests from tox, wether runtests or pytest
2019-01-24 17:02:13 +00:00
Megan Wilhite
9d487f20ec
Merge branch '2019.2.0.rc1' into merge_context
2019-01-24 11:09:57 -05:00
Megan Wilhite
a57b1e2c6c
Merge branch '2019.2.0.rc1' into salt-call-executor-options
2019-01-24 11:05:49 -05:00
Pedro Algarvio
b348034f96
Merge pull request #51307 from s0undt3ch/2019.2
...
Add 2019.2 codecov config
2019-01-24 13:34:24 +00:00
Pedro Algarvio
85e7ac67c1
Merge pull request #51306 from s0undt3ch/2018.3
...
Add 2018.3 codecov config
2019-01-24 13:34:13 +00:00
Pedro Algarvio
495aa5c8a3
Add 2019.2 codecov config
2019-01-24 13:30:11 +00:00
Pedro Algarvio
5f0f296a1a
Add 2018.3 codecov config
2019-01-24 13:28:59 +00:00
Pedro Algarvio
d6f4f055f5
Merge pull request #51298 from terminalmage/issue51258
...
Fix edge case when minion ID is a 16-character string
2019-01-24 11:42:01 +00:00
Pedro Algarvio
f94e721e75
Merge branch '2019.2.0.rc1' into issue51258
2019-01-24 11:41:48 +00:00
Pedro Algarvio
5a398a3503
Merge pull request #51207 from twangboy/fix_test_pkg
...
Backport 50771 to 2018.3
2019-01-24 11:40:08 +00:00
Pedro Algarvio
d4ab6d815b
Merge branch '2018.3' into fix_test_pkg
2019-01-24 11:39:57 +00:00
Pedro Algarvio
7a97cb4f67
Merge pull request #51252 from dwoz/issue-50221
...
Peserve newlines from pillar data for file.managed [2018.3]
2019-01-24 11:37:06 +00:00
Pedro Algarvio
f96828a9d6
Merge branch '2018.3' into issue-50221
2019-01-24 11:36:52 +00:00
Pedro Algarvio
cd5b50399a
Merge pull request #51296 from Ch3LL/bp-51285
...
Backport #51285 into 2019.2.0.rc1
2019-01-24 09:34:05 +00:00
Pedro Algarvio
253f5e4608
Merge pull request #51264 from gtmanfred/2018.3
...
an argument is not always needed to be passed to open a file
2019-01-24 07:55:25 +00:00
Pedro Algarvio
f3ebd32246
Merge branch '2018.3' into 2018.3
2019-01-24 07:55:12 +00:00
twangboy
3ed7b84792
Use __context__ in LGPO module
2019-01-23 14:22:35 -07:00
Megan Wilhite
7fa04212a3
Merge pull request #51223 from twangboy/merge_auditpol
...
Bring auditpol support to rc1
2019-01-23 15:48:21 -05:00
Erik Johnson
3649bb063f
Fix edge case when minion ID is a 16-character string
...
Some code in salt._compat which checks if the value is a packed binary
representation of an IPv6 address fails if the value passed is not a
bytestring (i.e. a `unicode` type on PY2 or `str` type on PY3). This
fixes that code when the minion ID is a 16-character string (not a
bytestring). Note that the minion ID will never be a bytestring as of
2018.3.0, so this affects any 16-character minion ID when the minion ID
is checked to see if it is really an IP address.
2019-01-23 14:29:36 -06:00
Gareth J. Greenaway
6e869d0a19
Ensure metadata is an accepted keyword argument for authentication functions.
2019-01-23 14:17:35 -05:00
Pedro Algarvio
aacc047686
Merge pull request #51274 from twangboy/fix_network
...
Fix minion start issue
2019-01-23 18:03:02 +00:00
Daniel Wallace
f553be764e
tuples don't have pop
2019-01-23 11:10:04 -06:00
Daniel Wallace
55ea80ee6c
don't shadow builtin
2019-01-23 09:53:50 -06:00
Daniel Wallace
6148c50781
an argument is not always needed to be passed to open a file
2019-01-23 09:53:50 -06:00
Daniel Wozniak
8a89cb2c4b
Merge pull request #51279 from twangboy/backport_lgpo
...
Backport __context__ support from develop
2019-01-23 08:28:46 -07:00
Daniel A. Wozniak
a5255f0eb2
Merge remote-tracking branch 'saltstack/2018.3' into issue-50221
2019-01-23 08:26:20 -07:00
Pedro Algarvio
344bf6567a
Fix tests. We no longer get ipaddress instances back.
2019-01-23 14:47:11 +00:00
Pedro Algarvio
8850b37d45
Merge pull request #51176 from twangboy/update_req_osx
...
Update dependencies in req.txt for OSX
2019-01-23 07:28:52 +00:00
Pedro Algarvio
d4d401b5d9
Merge branch '2019.2.0.rc1' into update_req_osx
2019-01-23 07:28:41 +00:00
Pedro Algarvio
411d682874
Merge pull request #51175 from twangboy/update_req_windows
...
Update dependencies in req.txt for Windows
2019-01-23 07:27:38 +00:00
Pedro Algarvio
7a05c1991b
Merge branch '2019.2.0.rc1' into update_req_windows
2019-01-23 07:27:23 +00:00
Pedro Algarvio
d22409694e
Merge pull request #51280 from garethgreenaway/merge-2019.2-rc
...
[2019.2] Merge forward from 2019.2.0rc1 to 2019.2
2019-01-23 07:08:31 +00:00
Pedro Algarvio
eab0a2aaa9
Merge pull request #51286 from twangboy/skip_test_cp
...
Skip test_get_file_templated_paths on Windows/Py3
2019-01-23 07:07:24 +00:00
Pedro Algarvio
6796e656ec
Merge pull request #51276 from garethgreenaway/merge-2018.3
...
[2018.3] Merge forward from 2017.7 to 2018.3
2019-01-23 07:04:20 +00:00
Pedro Algarvio
8596ee45a0
Merge pull request #51277 from garethgreenaway/merge-2019.2
...
[2019.2] Merge forward from 2018.3 to 2019.2
2019-01-23 07:01:29 +00:00
