valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 17:09:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
101,455 Commits 24 Branches 182 Tags 341 MiB
1200031263
Commit Graph

9560 Commits

Author SHA1 Message Date
Shane Lee
87bb513d63 Fix failing symlink test (#52145) 2019-03-27 14:58:57 -06:00
Dmitry Kuzmenko
cc46e9c498
Merge branch '2018.3' into bugs/49147_ipc_subscriber 2019-03-27 23:37:31 +03:00
Dmitry Kuzmenko
23733bde5a
Regression test for parallel IPCMessageSubscriber support 2019-03-27 23:33:10 +03:00
Wayne Werner
28c29459c8
keep_pillar not needed 2019-03-26 20:09:22 -05:00
Wayne Werner
f2aebf9cb5
Assume file contents are binary 
Try to encode as unicode, but if not, just fall back to binary.
That's probably what the data was in the first place.
 2019-03-26 19:41:47 -05:00
Wayne Werner
2b8c782891
Test gpg render with replace newlines 2019-03-26 19:41:40 -05:00
Wayne Werner
c4b385b92a
Allow binary pillar data 
There's no real reason that pillars can't/shouldn't be able to
contain binary data. This gives us the ability to say that it's OK.
 2019-03-26 19:41:33 -05:00
Wayne Werner
604b671ef9
Return binary data from gpg renderer 
If we receive binary data, we should respond with binary data.
 2019-03-26 19:41:26 -05:00
Gareth J. Greenaway
4908ed3048
Merge branch '2017.7' into merge-2018.3 2019-03-25 13:28:15 -07:00
Megan Wilhite
34d601e902
Merge branch '2019.2' into merge-2019.2 2019-03-22 16:38:07 -04:00
Pedro Algarvio
cc6fb4662a
Additionally ignore files in nox virtualenvs and CI artifacts directories 2019-03-21 11:32:39 +00:00
twangboy
c874831ef4
Don't set the domain grain to windowsdomain 2019-03-20 08:52:21 -06:00
twangboy
65eb461071
Add a test for windows grains 2019-03-19 15:40:56 -06:00
Ch3LL
c6ba2e605e
Fix lint for test_win_file 2019-03-15 10:55:22 -04:00
Ch3LL
9ada8d9b7f
Merge branch '2018.3' into '2019.2' 
Conflicts:
  - salt/transport/zeromq.py
  - tests/unit/modules/test_kubernetesmod.py
  - tests/unit/modules/test_win_file.py
 2019-03-14 16:13:54 -04:00
Gareth J. Greenaway
bfdb6691ff
Updating the reverse octal lookup dictionary. Updating tests. 2019-03-14 10:21:42 -07:00
Gareth J. Greenaway
4b99afa819
Fixing the output when there are changes for the ACL state so the permissions are shown and not the octal number. 2019-03-13 17:27:39 -07:00
twangboy
83bed46a60
Add missing symlink test 2019-03-11 15:52:55 -06:00
Gareth J. Greenaway
4a126b3c5b
Merge branch '2019.2' into 52036_rsync_state_no_changes_when_error 2019-03-07 15:38:34 -08:00
Gareth J. Greenaway
0fb859d5c8
Adding a test for the rsync state 2019-03-07 15:35:15 -08:00
twangboy
9a8afa6433
Fix tests, add null byte test 2019-03-07 16:28:31 -07:00
Daniel Wozniak
a7a97544d7
Merge pull request #51896 from twangboy/win_disks 
Add all attached drives to the disks grain
 2019-03-07 11:35:00 -07:00
Daniel Wozniak
48d298c568
Merge pull request #51918 from twangboy/fix_compat 
Fix _compat for py3
 2019-03-07 11:33:27 -07:00
Alexander Fischer
fcac9f3e92
Skip Test on Non-Windows systems 2019-03-07 11:33:09 -05:00
Alexander Fischer
f42d17d093
Derive from LoaderModuleMockMixin 2019-03-07 11:31:35 -05:00
Alexander Fischer
5052017ea6
Define __opts__ dict 2019-03-07 11:31:35 -05:00
Alexander Fischer
b7b571e393
Define __opts__ dict 2019-03-07 11:31:35 -05:00
Alexander Fischer
ee3ad08e14
Define __opts__ dict 2019-03-07 11:31:35 -05:00
Alexander Fischer
64d8451dcb
Use default file module 2019-03-07 11:31:34 -05:00
Alexander Fischer
886ef1997e
Fix name of makedirs_ method 2019-03-07 11:31:34 -05:00
Alexander Fischer
4cc5f77b76
Check for path to be a symlink 2019-03-07 11:31:31 -05:00
Megan Wilhite
54ea40a265
Merge branch '2019.2' into merge-2019.2 2019-03-07 10:38:23 -05:00
Shane Lee
057d415d23
Merge branch '2018.3' into win_disks 2019-03-06 12:35:34 -07:00
Gareth J. Greenaway
faa3471c05
Merge branch '2018.3' into 2018.3 2019-03-05 17:42:18 -08:00
twangboy
a791901775
Fix compat, add tests 2019-03-05 18:38:51 -07:00
Daniel Wozniak
2ebfa22f87
Merge pull request #51967 from twangboy/add_compat_tests 
Add unit tests for _compat.py
 2019-03-05 17:18:34 -07:00
twangboy
0d419e378c
Fix some lint 2019-03-05 17:13:08 -07:00
twangboy
aa61dabab4
Add tests 2019-03-05 17:09:07 -07:00
Ch3LL
a16891347c
Merge branch '2018.3' into '2019.2' 
Conflicts:
  - doc/conf.py
  - salt/modules/win_system.py
  - salt/states/boto3_route53.py
 2019-03-05 16:00:05 -05:00
Daniel Wozniak
2c4dff609c
Merge pull request #51905 from aplanas/fix_mount 
mount: fix extra -t parameter
 2019-03-05 12:55:59 -07:00
Daniel Wozniak
4b2c8cceff
Merge pull request #51815 from garethgreenaway/51673_multiple_file_sections_with_excludes 
[2018.3] Fix to inotify beacon when multiple file paths with excludes are used
 2019-03-05 12:49:38 -07:00
Daniel Wozniak
be28623bf7
Merge pull request #51946 from Ethyling/fix-systemd-version 
Fix retrieve systemd version using regex
 2019-03-05 12:20:18 -07:00
Shane Lee
e85f0043f6
Merge branch '2018.3' into add_compat_tests 2019-03-05 10:29:43 -07:00
twangboy
ea69062fb3
Fix lint 2019-03-05 10:28:59 -07:00
Jordan Jacobelli
b55770768f Add test for systemd version from git describe 
Signed-off-by: Jordan Jacobelli <jordan@cri.epita.fr>
 2019-03-05 12:41:31 +01:00
Alberto Planas
ac688df875 mount: fix extra -t parameter 
If 'fstype' parameter is not set in Linux environments, salt will
build a mount command with an empty -t value, making the command
fail.
 2019-03-05 11:48:09 +01:00
Daniel Wozniak
a879140e21
Merge branch '2019.2' into issue_51816 2019-03-05 03:02:12 -07:00
Daniel Wozniak
6aee2c4502
Merge pull request #51806 from twangboy/fix_beacon 
Fix diskusage beacon on Windows
 2019-03-05 02:23:10 -07:00
twangboy
eb984f5b32
Add unit tests for _compat.py 2019-03-04 18:08:18 -07:00
twangboy
a38300b156
Use winapi.com instead of coinitialize 2019-03-04 17:59:06 -07:00
Daniel A. Wozniak
0e61cf39e4
Fix linter errors/warnings 2019-03-04 14:48:33 -07:00
Daniel A. Wozniak
8c641c66fb
make LDAP attr defaults string types on py2 2019-03-04 14:36:14 -07:00
Gareth J. Greenaway
58ef51db75
Merge branch '2018.3' into 51673_multiple_file_sections_with_excludes 2019-03-01 11:40:07 -08:00
Daniel Wallace
1f3be1cb90
fix import in test 2019-03-01 13:37:42 -06:00
Daniel Wallace
8572c17091
rename kubernetes module to kubernetesmod 
This makes sure this doesn't import the kubernetes module from
salt/modules while the kubernetes python module is not installed
 2019-03-01 13:33:50 -06:00
Erik Johnson
1fcb0ff264
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-03-01 10:52:03 -05:00
Gareth J. Greenaway
63da8be7c9
Fixing a bug that caused excludes to not work as expected when multiple file options were in place, the excludes of the last file section were being used over any previous ones. Including a test to ensure excludes work as expected when multiple file sections are in place. 2019-02-25 17:19:39 -08:00
twangboy
2bf6179743
Fix some lint 2019-02-25 13:15:43 -07:00
twangboy
0f38eea9a0
Add lowercase test 2019-02-25 12:52:17 -07:00
twangboy
7cdc660552
Add some tests 2019-02-25 12:41:26 -07:00
Gareth J. Greenaway
61735787dc
Fixing lint errors 2019-02-23 10:01:01 -08:00
Gareth J. Greenaway
e37fc20e7c
Merge branch '2018.3' into merge-2018.3 
Conflicts:
  - doc/ref/modules/all/index.rst
  - salt/states/file.py
  - tests/unit/modules/test_yumpkg.py
  - tests/unit/modules/test_zypperpkg.py
  - tests/unit/states/test_file.py
 2019-02-22 16:38:15 -08:00
twangboy
64f45f8650
Make recurse and directory case sensitive 2019-02-22 11:44:39 -07:00
twangboy
feb29f3353
Make recurse and directory case sensitive 2019-02-21 18:59:09 -07:00
Gareth J. Greenaway
d681064607
Merge branch '2018.3' into nftables_cleanup 2019-02-20 12:03:58 -08:00
Gareth J. Greenaway
e37458ee35
Fixing a couple tests. 2019-02-20 09:52:54 -08:00
Ch3LL
4171271930
Fix pylint, remove unused import 2019-02-20 10:20:24 -05:00
Ch3LL
3f146197a1
Remove skipif and change expected return for solarisips test 2019-02-20 10:14:04 -05:00
Daniel Wallace
61b43905c2
fix modulenames from virtualnames tests 2019-02-20 08:06:29 -06:00
Daniel A. Wozniak
3263d31592
Merge remote-tracking branch 'saltstack/2018.3' into solarisipstests 2019-02-20 01:17:36 -07:00
Gareth J. Greenaway
dc4afbb8b4
More updates to nftables module, state modules, and unit tests. 2019-02-19 17:42:19 -08:00
Daniel A. Wozniak
9caafeca61
Skip solarisips when not on solaris 2019-02-19 16:59:10 -07:00
Daniel A. Wozniak
043efa08fa
Skip solarisips when not on solaris 2019-02-19 16:58:10 -07:00
Daniel Wallace
d59952fce6
Merge branch '2018.3' into virtualnames 2019-02-19 16:59:42 -06:00
Daniel Wallace
33bb5bfe69
fix use of virtualname 
Make sure that the virtualname is included in the actual filename of
core modules.  This will help speed up loading of modules that need to
use the virtualname, so that we hit @depends decorators less.
 2019-02-19 13:16:06 -06:00
Gareth J. Greenaway
3ec96e36e2
initial work to cleanup the nftables module, state module, and the unit tests. 2019-02-19 10:44:01 -08:00
Megan Wilhite
b46eac3ec0
Merge branch '2019.2' into merge-2019.2 2019-02-19 11:02:29 -05:00
Daniel Wozniak
0bd2d6eadb
Merge pull request #51561 from isbm/isbm-saltssh-thintar-delay-fix 
SaltSSH: fix delay when creating thin TAR
 2019-02-19 03:15:46 -07:00
Ch3LL
64322db582
Fix is_windows utils call 2019-02-15 15:18:24 -05:00
Ch3LL
92bd6b9dc3
Fix salt.utils.is_windows call 2019-02-15 15:16:38 -05:00
Ch3LL
ffa2f5fa50
Merge branch '2018.3' into '2019.2' 
Conflicts:
  - pkg/windows/build_env_2.ps1
  - pkg/windows/build_env_3.ps1
  - pkg/windows/req.txt
  - pkg/windows/req_win.txt
  - salt/grains/core.py
 2019-02-15 15:09:36 -05:00
Bo Maryniuk
f79c81a9e1 Update UT mocking, adjusting for temporary file 2019-02-14 15:50:21 +01:00
Gareth J. Greenaway
deeefc728b
Merge branch '2018.3' into 51266_schedule_enable_disable_break_save 2019-02-13 18:38:54 -08:00
Shane Lee
ddc017c857
Merge branch '2018.3' into add_tests_51534 2019-02-13 15:33:28 -07:00
twangboy
9e3a01b930
Use existing file instead of tzutil 2019-02-13 15:32:16 -07:00
twangboy
30c18324a4
Use tempfile to get temp dir 2019-02-13 12:40:19 -07:00
twangboy
e3d3c5a8e2
Add tests for issue 51309 2019-02-13 12:22:36 -07:00
Gareth J. Greenaway
0760133336
adding integration.scheduler.test_helpers to various files to by pass the test_module_name_source_match check. 2019-02-13 09:27:55 -08:00
Daniel Wozniak
6b1a2016db
Merge branch '2018.3' into 51069-ri-and-rdoc-removed 2019-02-13 01:57:14 -07:00
Daniel Wozniak
4abd9d0462
Merge branch '2019.2' into merge-2018.3 2019-02-13 01:12:52 -07:00
Daniel Wozniak
e8e91e3b27
Merge branch '2018.3' into solarisips_fixes 2019-02-12 21:22:15 -07:00
Benjamin Drung
7678c28be7 Do not load zyppnotify file on module import 
The call imp.load_source() could fail (i.e. when the specified
zyppnotify does not exist). To prevent an import failure in that case,
move the loading of the zyppnotify file into the test case.

Signed-off-by: Benjamin Drung <benjamin.drung@cloud.ionos.com>
 2019-02-12 11:25:24 +01:00
Gareth J. Greenaway
6c99cb161f
Merge branch '2018.3' into merge-2018.3 
Conflicts:
	doc/man/salt-api.1
	doc/man/salt-call.1
	doc/man/salt-cloud.1
	doc/man/salt-cp.1
	doc/man/salt-key.1
	doc/man/salt-master.1
	doc/man/salt-minion.1
	doc/man/salt-proxy.1
	doc/man/salt-run.1
	doc/man/salt-ssh.1
	doc/man/salt-syndic.1
	doc/man/salt-unity.1
	doc/man/salt.1
	doc/man/salt.7
	doc/man/spm.1
	pkg/osx/build_env.sh
	salt/utils/dns.py
	tests/integration/netapi/rest_tornado/test_app.py
	tests/support/case.py
	tests/unit/utils/test_dns.py
 2019-02-11 15:45:43 -08:00
Gareth J. Greenaway
6e55164416
Merge branch '2019.2.0.rc1' into merge-2019.2.0rc1 
Conflicts:
	Gemfile
 2019-02-11 11:27:20 -08:00
Gareth J. Greenaway
84e15cedf9
Fixing lint 2019-02-11 10:57:08 -08:00
Gareth J. Greenaway
e891b3f515
Merge branch '2018.3.4' into merge-2018.3.4 
Conflicts:
	tests/integration/states/test_file.py
	tests/unit/states/test_file.py
	tests/unit/utils/test_dns.py
 2019-02-11 10:46:53 -08:00
Daniel Wozniak
f7d50b13b4
Merge pull request #50784 from sathieu/dynamic_file_roots 
Allow dynamic file_roots
 2019-02-08 11:09:39 -07:00
twangboy
9a5d07673b
Add Windows Server 2019 2019-02-07 10:27:23 -07:00
lomeroe
b7bfe1766b lint fixes 2019-02-07 10:52:41 -06:00
lomeroe
cdaccf4679 add tests to validate command being sent to cmd.run_all 2019-02-07 10:52:41 -06:00
lomeroe
eaa229dde5 add unit test 2019-02-07 10:52:41 -06:00
Gareth J. Greenaway
d31c902931
Updating the mysql module to handle MariDB versions. 2019-02-07 11:19:02 +01:00
Mathieu Parent
7ca2aa4919
Allow dynamic file_roots 
Fixes: #48132
 2019-02-06 21:33:11 +01:00
twangboy
227f949f4e
Backport 51095 2019-02-06 12:00:35 -07:00
twangboy
b6acc92e87
Backport 51095 2019-02-06 11:58:57 -07:00
Daniel Wozniak
1f981c62ac
Merge pull request #51429 from yosnoop/replace-noclass-with-nocl-for-dig 
The +nocl is supported much wider than +noclass
 2019-02-06 10:48:47 -07:00
Daniel Wozniak
209ef32049
Merge pull request #51441 from Ch3LL/bp-51366 
Backport #51366 into 2018.3.4
 2019-02-06 10:42:18 -07:00
Ty Hahn
14e6fb758f
In case the test machine can't resolve 
With -v option, dig does not attemp to resolve while verifying all the given
options.
 2019-02-03 23:10:37 +09:00
Ty Hahn
a00d708441
Test dig options for salt.utils.dns.lookup 2019-02-03 23:01:39 +09:00
Anton Zhabolenko
ed62a2f873
Fix insecure SQL queries in mysql.user_chpass 2019-02-01 13:07:25 +03:00
Lee Webb
f339608a88
Merge branch '2018.3' into 51069-ri-and-rdoc-removed 2019-02-01 11:25:19 +11:00
Daniel A. Wozniak
2d8a3641bc
Fix linter issues 2019-01-30 17:05:03 -05:00
Daniel A. Wozniak
9b8718a1d5
Cloud provider and profile configs are merged 2019-01-30 17:04:50 -05:00
Gareth J. Greenaway
bd41ff0f59
Fixing various bits in x509 module and unit test to ensure tests are passing on python2 & python3 2019-01-30 11:01:06 -05:00
Alberto Planas
467daf2e4c parted: support variable length output for print 
The command print from parted have a variable lenght output,
depending on the units requested, or the kind of partition.

This patch add the logic to support the full range of outputs
that parted 3.1, and early versions, are generating.

(cherry picked from commit 5adf859e3f)
 2019-01-30 13:44:27 +01:00
Alberto Planas
da2e632566 parted: fix the ordering of list command 
The command `parted -m -s {} print` do not print the "Type" column,
but after the "File System" column print the name of the partition.

This point that the type of the partition cannot be extracted using
parted with machine parseable output.

(cherry picked from commit f23d618e11)
 2019-01-30 11:02:26 +01:00
Daniel Wozniak
48062c89a7
Merge branch '2018.3' into cloud_config_merge 2019-01-29 19:43:26 -07:00
Pedro Algarvio
04eb66bc8e
Merge branch '2018.3' into issue51255 2019-01-28 23:19:04 +00:00
Daniel A. Wozniak
542d85713b
Fix linter issues 2019-01-28 10:32:00 -07:00
Daniel A. Wozniak
a2bbf4dea8
Fix linter issues 2019-01-28 10:30:35 -07:00
Daniel A. Wozniak
004d9b828f
Cloud provider and profile configs are merged 2019-01-28 10:23:18 -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
d4b90933ac
Merge pull request #51336 from Ch3LL/merge-2019.2.0rc1 
[2019.2] Merge Forward from 2019.2.0.rc1 to 2019.2
 2019-01-27 16:55:08 -07: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
02b43a09fb
Merge pull request #51334 from Ch3LL/merge-2019.2 
[2019.2] Merge forward from 2018.3 to 2019.2
 2019-01-27 16:49:31 -07:00
Daniel Wozniak
4e855050e8
Merge branch '2018.3.4' into bp-51170 2019-01-27 16:44:10 -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
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
c893dc445a
Fix saltmod roster test 2019-01-25 14:32:58 -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
Gareth J. Greenaway
2284ea5162
Merge branch '2019.2' into merge-2019.2.0rc1 2019-01-25 11:30:27 -08:00
Ch3LL
18bf2369f8
Merge branch '2019.2.0.rc1' into 2019.2 
Conflicts:
  - salt/modules/win_lgpo.py
 2019-01-25 14:27:17 -05:00
Ch3LL
25ec653fd4
Merge branch '2018.3' into '2019.2' 
Conflicts:
  - .codecov.yml
  - salt/modules/artifactory.py
 2019-01-25 13:19:07 -05:00
Pedro Algarvio
da3aace317
Merge branch '2018.3.4' into hotfix/fix-network 2019-01-25 15:14:24 +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
78c6d68008
Run tests from tox, wether runtests or pytest 2019-01-25 13:00:02 +00:00
Pedro Algarvio
bd7072f3c8
Merge branch '2018.3' into 1257_something_something_bytes_argh_python2 2019-01-25 09:34:49 +00: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
Pedro Algarvio
f27589aff7
Remove unused imports 2019-01-24 23:21:00 +00:00
Pedro Algarvio
3000d2095d
Fix tests. We no longer get ipaddress instances back. 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
5812eae808
Adding a test to ensure dns_check works as expected. 2019-01-24 14:48:41 -08: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
138ca2e682
Show objects on assertion failure 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
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
aa108d5dd1
Run tests from tox, wether runtests or pytest 2019-01-24 16:58:41 +00:00
Ty Hahn
9a34bcda10 Unit test for lookup with servers option 2019-01-24 22:14:30 +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
Pedro Algarvio
f94e721e75
Merge branch '2019.2.0.rc1' into issue51258 2019-01-24 11:41:48 +00: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
53ba0689a8
When test=True and there are permissions changes, report it. 2019-01-23 14:06:31 -05:00
Pedro Algarvio
04f16b8c91
Fix tests. We no longer get ipaddress instances back. 2019-01-23 18:07:25 +00:00
Pedro Algarvio
aacc047686
Merge pull request #51274 from twangboy/fix_network 
Fix minion start issue
 2019-01-23 18:03:02 +00:00
Pedro Algarvio
344bf6567a
Fix tests. We no longer get ipaddress instances back. 2019-01-23 14:47:11 +00:00
Thomas S Hatch
1abffb20b9
Merge pull request #51278 from dwoz/issue51248 
Warn about proper validation option
 2019-01-22 15:13:12 -07:00
Daniel A. Wozniak
c614198477
Use pillar roots validation method 2019-01-22 12:19:06 -07:00
Ch3LL
1dd92a943a
Fix pylint for 2019.2 2019-01-22 13:38:45 -05:00
Daniel A. Wozniak
0d2b0c635f
Fix linter warnings 2019-01-22 10:40:57 -07:00
Erik Johnson
c8e70a90a6
Merge pull request #51206 from terminalmage/fix-reload 
Fix usage of reload for PY3 compatibility
 2019-01-22 11:34:45 -06:00
Daniel A. Wozniak
5b98895588
Fix wart in pillar_roots validation 
Adds tests for pillar and file roots validation
 2019-01-22 10:23:08 -07:00
Gareth J. Greenaway
d0d5726ffa
Merge branch '2018.3' into merge-2019.2 2019-01-22 09:20:42 -08:00
Lee Webb
e586370c67
Merge branch '2018.3' into 51069-ri-and-rdoc-removed 2019-01-21 10:01:46 +11:00
Daniel Wozniak
d5acd5bc9c
Merge pull request #51170 from dwoz/issue51158 
Honor roster system for ssh orchestrations
 2019-01-19 16:16:05 -07:00
Gareth J. Greenaway
c33c5589ca
Backport #50358 to 2017.7 2019-01-18 12:16:03 -08:00
Megan Wilhite
3b966f3ba5
Merge branch '2019.2' into merge-2019.2 2019-01-18 14:47:57 -05:00
Gareth J. Greenaway
cd80548e79
When test=True and there are permissions changes, report it. 2019-01-17 17:31:23 -05:00
Lee Webb
13d3288b88 Fix lint issues 2019-01-18 09:17:47 +11:00
Ch3LL
ffe23fa258
Merge branch '2018.3' into '2019.2' 
Conflicts:
  - salt/cloud/clouds/azurearm.py
  - salt/minion.py
  - salt/utils/network.py
 2019-01-17 17:11:00 -05:00
twangboy
35adc8b272
Merge forward #51154 and #51184 2019-01-17 10:25:12 -07:00
Mathieu Parent
f9437e2590
Test for file_roots envs with slash leads to "No such file or directory" 
See #51211.

2019-01-08 09:57:23,653 [salt.master      :1795][ERROR   ][28091] Error in function _file_list:
Traceback (most recent call last):
  File "/usr/lib/python2.7/dist-packages/salt/master.py", line 1788, in run_func
    ret = getattr(self, func)(load)
  File "/usr/lib/python2.7/dist-packages/salt/utils/decorators/__init__.py", line 594, in wrapped
    **salt.utils.data.decode_dict(kwargs)
  File "/usr/lib/python2.7/dist-packages/salt/fileserver/__init__.py", line 752, in file_list
    ret.update(self.servers[fstr](load))
  File "/usr/lib/python2.7/dist-packages/salt/fileserver/roots.py", line 422, in file_list
    return _file_lists(load, 'files')
  File "/usr/lib/python2.7/dist-packages/salt/fileserver/roots.py", line 310, in _file_lists
    __opts__, form, list_cache, w_lock
  File "/usr/lib/python2.7/dist-packages/salt/fileserver/__init__.py", line 122, in check_file_list_cache
    if not os.path.isfile(list_cache) and _lock_cache(w_lock):
  File "/usr/lib/python2.7/dist-packages/salt/fileserver/__init__.py", line 56, in _lock_cache
    os.mkdir(w_lock)
OSError: [Errno 2] No such file or directory: '/var/cache/salt/master/file_lists/roots/.foo/bar.w'
 2019-01-17 17:03:33 +01:00
U-KEIRIN\lwebb
5de5e643da Update tests 2019-01-17 15:50:38 +11:00
Erik Johnson
31ca7c6936
Fix usage of reload for PY3 compatibility 
This also normalizes some hacks that were in place to import reload from
importlib, so that these instances also use the compatibility function.
 2019-01-16 16:37:41 -06:00
Ch3LL
810c6119ec
Merge branch '2019.2.0.rc1' into 2019.2 2019-01-16 16:38:32 -05:00
Daniel A. Wozniak
b69c002e68
Fix saltmod roster test 2019-01-16 11:20:05 -07:00
Daniel Wozniak
094bd33279
Merge pull request #51184 from twangboy/fix_auditpol 
Fix win_lgpo_auditpol salt util on Windows
 2019-01-16 11:08:00 -07:00
twangboy
7300d84d54
Skip debian tests on Windows 2019-01-16 09:31:37 -05:00
twangboy
4622433f84
Fix test_debian_ip on Windows 2019-01-16 09:31:33 -05:00
twangboy
2e68d35678
directly call cmd.run_all 
Apparently, you can't always use __salt__ in a util
 2019-01-15 18:09:36 -07:00
Daniel Wozniak
563d4875b8
Merge pull request #51010 from amendlik/ldap-groups 
Allow unauthenticated bind for listing LDAP groups
 2019-01-15 09:43:41 -07:00
Daniel Wozniak
b19c990a16
Merge pull request #51097 from terminalmage/fix-keyerror-raise 
Fix improper exception raises (2018.3)
 2019-01-15 09:38:24 -07:00
Daniel Wozniak
58eede65a7
Merge pull request #51173 from dwoz/issue51160 
Avoid exceptions by passing bytes to idna
 2019-01-15 09:32:30 -07:00
Jeremy McMillan
0a92c4691d Need more detail on test failure 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
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