valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 09:23:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
96,263 Commits 24 Branches 182 Tags 341 MiB
c4bbe1ac81
Commit Graph

96263 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
3840af86df
"Tell" coverage to track subprocesses. 2019-01-25 12:58:52 +00: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
Pedro Algarvio
f67a529b7a
Remove unused imports 2019-01-24 20:33:08 +00:00
twangboy
f4177e0adb
Remove mode parameter on Windows 2019-01-24 10:11:48 -07:00
Pedro Algarvio
15ab061b8c
Show objects on assertion failure 2019-01-24 16:58:42 +00:00
Pedro Algarvio
0281fc5b50
Don't fail the test because of order 2019-01-24 16:58:42 +00:00
Pedro Algarvio
9a31be7271
Don't call .keys() on dictionaries 2019-01-24 16:58:42 +00:00
Pedro Algarvio
97ced3a5ba
Add pytest-salt-from-filenames to pytest requirements 2019-01-24 16:58:41 +00:00
Pedro Algarvio
8d2c4d25df
Remove duplicate dependency 2019-01-24 16:58:41 +00:00
Pedro Algarvio
5eec144873
Add .coveragerc 2019-01-24 16:58:41 +00:00
Pedro Algarvio
aa108d5dd1
Run tests from tox, wether runtests or pytest 2019-01-24 16:58:41 +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
93096392ff
Merge pull request #51305 from s0undt3ch/2017.7 
Add 2017.7 codecov config
 2019-01-24 13:34:02 +00:00
Pedro Algarvio
5f0f296a1a
Add 2018.3 codecov config 2019-01-24 13:28:59 +00:00
Pedro Algarvio
09b20dfadc
Add 2017.7 codecov config 2019-01-24 13:26:16 +00:00
Erik Johnson
c02757d70b
gitfs: Fix use of deprecated pygit2 function 
0.27.4 (released 5 days ago) removed pygit2.Reference.get_object()
 2019-01-24 07:24:34 -06:00
Ty Hahn
9a34bcda10 Unit test for lookup with servers option 2019-01-24 22:14:30 +09:00
Ty Hahn
9498fdc8bc Fix _lookup_host to make it work when server specified 
Looking at _host_ source code, split with two new lines is proper.

From https://ftp.isc.org/isc/bind9/9.13.5/bind-9.13.5.tar.gz

$ grep -A10 listed_server.*printed_server bin/dig/host.c
        if (listed_server && !printed_server) {
                char sockstr[ISC_SOCKADDR_FORMATSIZE];

                printf("Using domain server:\n");
                printf("Name: %s\n", query->userarg);
                isc_sockaddr_format(&query->sockaddr, sockstr,
                                    sizeof(sockstr));
                printf("Address: %s\n", sockstr);
                printf("Aliases: \n\n");
                printed_server = true;
        }
 2019-01-24 21:32:46 +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
Ty Hahn
1363d2bd89 Proper way to specify _server_ to query with _host_ 2019-01-24 21:32:46 +09:00
Ty Hahn
7b2facc37f Fix broken lookup in salt/utils/dns.py 
Fixes #51249

The _multi_srvr recursively called since resolver in the function points
to _multi_srvr.
 2019-01-24 21:32:46 +09: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
40b20126d6
Merge pull request #51292 from Ch3LL/bp-51226 
Backport #51226 into 2018.3.45
 2019-01-24 11:11:33 +00:00
Pedro Algarvio
aba114ea13
Merge branch '2018.3.4' into bp-51226 2019-01-24 11:11:05 +00:00