Daniel Wozniak
326425cb4e
Merge pull request #51352 from garethgreenaway/fixing_service_beacon_documentation
...
[2018.3] Fixing service beacon documentation
2019-01-27 16:41:31 -07:00
Gareth J. Greenaway
021fe85cfb
Fixing the documentation for the service beacon. If not options are provided for the service then there needs to be an empty dictionary.
2019-01-26 15:26:39 -08:00
Ty Hahn
0ddfad1270
Merge branch '2018.3' into fix-salt-utils-dns-lookup
2019-01-26 06:55:49 +09:00
Pedro Algarvio
14a84e803c
Merge pull request #51333 from Ch3LL/merge-2018.3
...
[2018.3] Merge forward from 2017.7 to 2018.3
2019-01-25 20:51:20 +00:00
Pedro Algarvio
27d7a89081
Merge branch '2018.3' into merge-2018.3
2019-01-25 20:51:08 +00:00
Ty Hahn
9fb4abea3f
Merge branch '2018.3' into fix-salt-utils-dns-lookup
2019-01-26 05:31:46 +09:00
Wayne Werner
e3080f10d6
Add sleep before sending stop over UDP
...
UDP packets are unordered - and apparently on Mac it's pretty easy for
the stop message to come before the last message we're trying to test
with. This has us wait a tenth of a second more before we tell the test
thing to stop.
Signed-off-by: Wayne Werner <wwerner@saltstack.com>
2019-01-25 14:48:40 -05:00
Daniel A. Wozniak
e74a6c61de
Fix py3 managed.file test failure
2019-01-25 14:42:50 -05:00
Daniel A. Wozniak
6f2c7cf9e9
Remoe un-needed log statement
2019-01-25 14:42:44 -05:00
Daniel A. Wozniak
824950c4cd
Fix 50221 regression test on Windows
2019-01-25 14:42:38 -05:00
Daniel A. Wozniak
1840af9c00
peserve newlines from pillar data for file.managed
2019-01-25 14:42:32 -05:00
Daniel A. Wozniak
156f53219a
Backport aws role support
2019-01-25 12:42:17 -07:00
twangboy
345ae676b6
Backport PR# 50771 to 2018.3 branch
2019-01-25 14:38:30 -05:00
Daniel A. Wozniak
c893dc445a
Fix saltmod roster test
2019-01-25 14:32:58 -05:00
Daniel A. Wozniak
b61854f594
Roster defines the roster system not a file
2019-01-25 14:32:52 -05:00
Daniel A. Wozniak
484bab4399
Fix linter
2019-01-25 14:32:42 -05:00
Daniel A. Wozniak
5e2db2f7af
Honor roster file for ssh orchestrations
2019-01-25 14:32:36 -05:00
Pedro Algarvio
31b921f7a5
Merge pull request #51304 from terminalmage/issue51270
...
gitfs: Fix use of deprecated pygit2 function
2019-01-25 19:01:57 +00:00
Pedro Algarvio
36673fba1d
Merge branch '2018.3' into issue51270
2019-01-25 19:01:48 +00:00
Pedro Algarvio
2c3aef7eca
Merge pull request #51313 from s0undt3ch/features/tox-runtests-2018.3
...
[2018.3] Allow running runtests.py using tox
2019-01-25 18:55:38 +00:00
Ch3LL
ae62ebce8b
Merge branch '2017.7' into '2018.3'
...
Conflicts:
- .codecov.yml
2019-01-25 13:06:23 -05:00
Pedro Algarvio
e90ca1d63c
Merge pull request #51290 from s0undt3ch/hotfix/fix-network
...
[2018.3.4] Fix minion start
2019-01-25 15:14:46 +00:00
Pedro Algarvio
da3aace317
Merge branch '2018.3.4' into hotfix/fix-network
2019-01-25 15:14:24 +00:00
Pedro Algarvio
2eafc5c411
"Tell" coverage to track subprocesses.
2019-01-25 13:00:03 +00:00
Pedro Algarvio
f6babeb915
Remove unused imports
2019-01-25 13:00:03 +00:00
Pedro Algarvio
ff6824c682
Don't fail the test because of order
2019-01-25 13:00:03 +00:00
Pedro Algarvio
4d12ccbb1a
Show objects on assertion failure
2019-01-25 13:00:03 +00:00
Pedro Algarvio
ee2f10a23b
Add pytest-salt-from-filenames to pytest requirements
2019-01-25 13:00:03 +00:00
Pedro Algarvio
4f4d019ef8
Remove duplicate dependency
2019-01-25 13:00:03 +00:00
Pedro Algarvio
1d4b9f5754
Add .coveragerc
2019-01-25 13:00:03 +00:00
Pedro Algarvio
78c6d68008
Run tests from tox, wether runtests or pytest
2019-01-25 13:00:02 +00:00
Erik Johnson
c817213410
Don't try to run git.config_get_regexp from nonexistant cwd
...
If the repo has not yet been cloned then this will result in an error.
And since we are checking the global gitconfig here, there's no need to
run it from the target dir.
2019-01-25 06:59:20 -06:00
Pedro Algarvio
f62cc11d78
Merge pull request #51324 from garethgreenaway/1257_something_something_bytes_argh_python2
...
[2018.3] Fixes to x509 module and test
2019-01-25 09:34:59 +00:00
Pedro Algarvio
bd7072f3c8
Merge branch '2018.3' into 1257_something_something_bytes_argh_python2
2019-01-25 09:34:49 +00:00
Pedro Algarvio
c8db7e3751
Merge pull request #51317 from terminalmage/fix-pr-50417
...
Fix regression in dynamic pillarenv
2019-01-25 09:29:44 +00:00
Pedro Algarvio
4be2891855
Merge branch '2018.3.4' into fix-pr-50417
2019-01-25 09:29:31 +00:00
Pedro Algarvio
b44cd84cb2
Merge pull request #51323 from garethgreenaway/network_dns_check_test
...
[2018.3] Adding a test to ensure dns_check works as expected.
2019-01-25 09:28:16 +00:00
Pedro Algarvio
055eadc1c0
Merge branch '2018.3' into network_dns_check_test
2019-01-25 09:28:00 +00:00
Daniel Wozniak
be57a0f55c
Merge pull request #51321 from terminalmage/issue51256
...
Fix 500 error when using wheel_async
2019-01-24 20:51:34 -07:00
Gareth J. Greenaway
0e542c5515
Fixing various bits in x509 module and unit test to ensure tests are passing on python2 & python3
2019-01-24 16:41:49 -08: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
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
Ty Hahn
67e4131457
Merge branch '2018.3' into fix-salt-utils-dns-lookup
2019-01-25 06:25:20 +09:00
Thomas S Hatch
e246fdb6d3
Merge pull request #51311 from twangboy/fix_test_file.test_managed
...
Fix failing test `unit.states.test_file.TestFileState.test_managed` on Windows
2019-01-24 14:09:35 -07:00
Erik Johnson
f8c3e44f0b
git.latest: add auth to merge/reset calls when LFS used with SSH auth
...
In these cases, if the commands are not auth'ed then the git LFS
subcommands don't know which identity file to use and will fall back to
the one from `~/.ssh/config`. By ensuring that the command is auth'ed,
the LFS subcommands are able to download files when needed.
Normally we don't need to auth to the remote repo for this, since we
have made sure that we already have the needed objects downloaded, and
that is why these commands were not auth'ed before.
2019-01-24 15:04:17 -06:00
Erik Johnson
4c4ded3632
Fix regression in dynamic pillarenv
...
https://github.com/saltstack/salt/pull/50417 caused a regression in
which the env name is not properly detected as `base` when
`get_checkout_target()` returns the branch name corresponding to that
repo's `base` config option. This corrects that regression.
2019-01-24 14:35:11 -06:00
