Erik Johnson
c84be3fb4f
Allow for kwargs to be used in object initialization
2019-01-30 15:44:06 -06:00
Erik Johnson
2bf93fd9af
pip states: Use case-insensitive dictionaries for pip.list return
2019-01-30 15:44:06 -06:00
Erik Johnson
792f05403c
Add a CaseInsensitiveDict implementation
2019-01-30 15:21:38 -06:00
Erik Johnson
1410164ee9
pip.installed: Fix traceback when _find_key doesn't return a match
2019-01-30 15:16:50 -06:00
Daniel Wozniak
60953b723a
Merge pull request #51366 from dwoz/cloud_config_merge
...
Cloud provider and profile configs are merged [2018.3]
2019-01-30 11:58:45 -07:00
Pedro Algarvio
9ab2ec62f9
Coverage on windows chokes with the tox env var COVERAGE_PROCESS_START
2019-01-30 11:48:37 +00:00
Pedro Algarvio
4994c388de
Switch required PyTest dependency
2019-01-30 11:48:30 +00:00
Daniel A. Wozniak
ae351eb055
Fix python 3 path for shell test cases
2019-01-30 03:13:21 -07:00
Daniel Wozniak
48062c89a7
Merge branch '2018.3' into cloud_config_merge
2019-01-29 19:43:26 -07:00
Daniel A. Wozniak
eeea289806
Add testing path to run_script commands
2019-01-29 19:38:46 -07:00
Daniel Wozniak
89710a7e37
Merge pull request #51401 from dwoz/run_script_win
...
Add testing path to run_script commands [2018.3]
2019-01-29 18:34:48 -07:00
Daniel A. Wozniak
77fdf35e3c
Add testing path to run_script commands
2019-01-29 17:26:04 -07:00
Erik Johnson
1438a6299d
Merge pull request #51389 from terminalmage/proxy-fixes
...
Backport proxy fixes to 2018.3
2019-01-29 14:17:27 -06:00
Erik Johnson
3cec85e725
Normalize results if test proxy is enabled
2019-01-29 12:58:24 -06:00
Megan Wilhite
8acd9e5da2
Merge pull request #51368 from s0undt3ch/hotfix/tests
...
Fix test
2019-01-29 12:36:48 -05:00
Pedro Algarvio
ab60782de4
Merge pull request #51319 from terminalmage/issue51255
...
git.latest: add auth to merge/reset calls when LFS used with SSH auth
2019-01-28 23:19:29 +00:00
Pedro Algarvio
04eb66bc8e
Merge branch '2018.3' into issue51255
2019-01-28 23:19:04 +00:00
Pedro Algarvio
f4e169255b
Fix test
2019-01-28 20:37:05 +00:00
Daniel A. Wozniak
542d85713b
Fix linter issues
2019-01-28 10:32:00 -07:00
Daniel A. Wozniak
a8af3baed2
Cloud provider and profile configs are merged
2019-01-28 10:20:54 -07:00
Erik Johnson
ad17ac591c
Fix mocks to reflect changes to git.latest state
2019-01-28 10:46:26 -06:00
Daniel Wozniak
fdf2cf4893
Merge pull request #51250 from yosnoop/fix-salt-utils-dns-lookup
...
Fix broken lookup in salt/utils/dns.py
2019-01-27 16:53:52 -07:00
Daniel Wozniak
73528a54dd
Merge pull request #51339 from dwoz/aws_role_backport
...
Backport aws role support [2018.3]
2019-01-27 16:50:16 -07:00
Daniel Wozniak
7908875bc0
Merge pull request #51341 from Ch3LL/bp-51299
...
Backport #51299 into 2018.3
2019-01-27 16:43:35 -07:00
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
156f53219a
Backport aws role support
2019-01-25 12:42:17 -07: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
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
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
