Commit Graph

89687 Commits

Author SHA1 Message Date
Dmitry Kuzmenko
fe87704ff2
Slots: @terminalmage code review fixes. 2018-01-11 14:05:58 +03:00
Dmitry Kuzmenko
535024f03a
Slots: minor fixes. 2018-01-11 14:05:58 +03:00
Dmitry Kuzmenko
b55bba0d46
Slots documentation. 2018-01-11 14:05:58 +03:00
Dmitry Kuzmenko
f40cb3f2f1
Slots: bugfixes and tests. 2018-01-11 14:05:58 +03:00
Dmitry Kuzmenko
9782b4e9a8
Working slots concept for execution modules. 2018-01-11 14:05:57 +03:00
Thomas S Hatch
deaa1dccc9
start work on slots... again 2018-01-11 14:05:57 +03:00
Dmitry Kuzmenko
7622e355cf
Minor: removed a stale comment. 2018-01-11 14:03:41 +03:00
Dmitry Kuzmenko
00f31bf9b5
Fixes to work with pyzmq with --enable-drafts
1. Let pyzmq to correctly cleanup stream by itself

2. Don't close IOLoop that closes managed IO objects until full async
object cleanup that produces closing streams and attempts to operate to
strutures deinitialized by the closed IOLoop.
2018-01-11 14:03:38 +03:00
Nicole Thomas
dbe21b2c0d
Merge pull request #45369 from rallytime/merge-2017.7
[2017.7] Merge forward from 2016.11 to 2017.7
2018-01-10 17:14:04 -05:00
Erik Johnson
ff3039db6c
Skip flaky test on 2017.7 branch
The behavior of the set union used to combine ext_nodes and top file
matches is not consistent on Python 3 (well, 3.5 at least), and this
produces flaky test results.

Since we do not change things like the state compiler in point
releases, the method used to combine the ext_nodes and top file matches
has been changed for Oxygen and is now fully deterministic. This test
will therefore be skipped for the remainder of the 2017.7 release cycle
on Python 3.

Fixes https://github.com/saltstack/salt-jenkins/issues/686.
2018-01-10 16:02:32 -06:00
Nicole Thomas
a37f7d7cd4
Merge pull request #45377 from terminalmage/py3-log-grains
[PY3] add unicode_literals to log/grains modules
2018-01-10 15:14:23 -05:00
Nicole Thomas
55979b3a48
Merge pull request #45379 from rhoths/rhoths-doc-highstate-1
Minor spelling/grammar fixes in the highstate returner documentation
2018-01-10 15:09:51 -05:00
Chase Urich
afbbd492cd Minor spelling/grammar fixes in highstate returner 2018-01-10 12:18:55 -06:00
twangboy
419be8a9b5
Backport changes from #45308 2018-01-10 11:16:59 -07:00
Daniel Wallace
3633ceeaa7
Merge branch '2017.7' into 2017.7 2018-01-10 11:11:29 -07:00
Erik Johnson
f900715e1c
[PY3] add unicode_literals to log/grains modules 2018-01-10 11:37:59 -06:00
Nicole Thomas
541e59fa75
Merge pull request #45358 from UtahDave/gate_data_cache_refresh
gate the minion data cache refresh events.
2018-01-10 12:21:04 -05:00
Nicole Thomas
54dc7b76e5
Merge pull request #45340 from twangboy/win_fix_test_beacons
Fix `unit.modules.test_beacons` for Windows
2018-01-10 12:10:52 -05:00
Erik Johnson
ccfa24260d
Fix warnings when default config values are set to None 2018-01-10 09:42:20 -06:00
Erik Johnson
3565bc2bf2
Don't use include-test SLS in orch tests
This was the _actual_ cause of the failing test in the state module
integration tests.
2018-01-10 10:29:15 -05:00
Erik Johnson
8bc17e0d7a
Fix integration.modules.test_state.StateModuleTest.test_exclude
test_exclude shares file paths with test_include, and while I can't
reproduce the failures, it is likely that improperly cleaned-up files
from test_include are causing the failures in test_exclude. This is
backed up by the fact that the state.sls return data from the
salt-runtests.log shows no trace of the "to-include-test" file
(suggesting it was excluded as expected), yet os.path.isfile() returns
True for this path, causing the test to fail.

This commit uses a distinct base dir for both tests, which should keep
this sort of failure from happening.
2018-01-10 10:29:15 -05:00
rallytime
f65e091df8
Merge branch '2016.11' into '2017.7'
No conflicts.
2018-01-10 10:15:19 -05:00
Nicole Thomas
32806d00b3
Merge pull request #45308 from twangboy/win_fix_test_state
Fix `integration.modules.test_state` for Windows
2018-01-10 09:38:25 -05:00
twangboy
e3e0dba15d
Fix failing ubuntu test 2018-01-09 21:30:51 -07:00
Erik Johnson
de7eea42fb
Add test for modified virtualnames in salt.config 2018-01-09 19:11:17 -06:00
Erik Johnson
ef76bc6fcd
Update documentation for update intervals feature 2018-01-09 19:11:17 -06:00
Erik Johnson
958c99b87c
Move FS updates to their own process
This removes fileserver updating from the maintenance process and puts
them in a dedicated process. It also makes a couple changes reverting
some unicode changes that I made a couple months ago. A class' name is
never unicode in PY2.
2018-01-09 19:11:17 -06:00
Erik Johnson
16096bf0d3
Add update_intervals func to salt.fileserver.Fileserver
Additionally, make "_gen_back" a public function, renaming it to
"backends".
2018-01-09 19:11:17 -06:00
Erik Johnson
2d6760ee40
Add update_interval to gitfs, "fs" to several virtual names
This also adds "fs" to all of the fileserver virtualnames which did not
already have them. This both A) normalizes the usage of the non-roots
backends, and B) makes it easier for the FileserverUpdate process to get
the default update interval for each backend from the opts.
2018-01-09 19:11:17 -06:00
Erik Johnson
e192b422fb
Add versionadded 2018-01-09 19:11:17 -06:00
Erik Johnson
58ecddee5c
Docstring tweak 2018-01-09 19:11:16 -06:00
Daniel Wallace
29806e4496
ignore salt.ext in pylint 2018-01-09 17:49:50 -07:00
twangboy
53506a5e86
Fix some additional tests
- Fix problem with invalid characters in requisites.prereq_simple2
- Fix problem with true/false commands in Windows. Need to use exit
- Fix some issues with hard-coded paths to /tmp
2018-01-09 16:50:29 -07:00
David Boucha
379b6cd23e
should be self, not salt 2018-01-09 16:26:56 -07:00
David Boucha
a82e158f2d
gate the minion data cache refresh events. 2018-01-09 15:52:16 -07:00
twangboy
0be187cfe0
Move try except block 2018-01-09 15:23:51 -07:00
twangboy
db52f086e3
Fix some tests in integration.modules.test_state
Fixes the following tests:
- test_get_file_from_env_in_top_match
- test_issue_1896_file_append_source
- test_state_sls_id_test

Fixes in issue in file.managed where a command execution error was being
raised if the target file did not exist.
2018-01-09 15:21:58 -07:00
twangboy
5d45a4478f
Fix unit.modules.test_file for Windows
Fixes `_regex_to_static` function for Windows. Regex returns the `\r`
portion of the Windows line ending as part of the regex search. We're
going to trim that off the end.

Skips `test_check_file_meta_no_lsattr` as there is this is Linux
specific

Opens files in binary mode on Windows in the tests

Changes to the appropriate assert calls

Fixes line ending issues in the file_content and file_modified variables
in the test
2018-01-09 15:17:25 -07:00
Nicole Thomas
f4e8d98a0e
Merge pull request #45275 from terminalmage/yumpkg-diff_attr
yumpkg: don't use diff_attr when determining install/downgrade targets
2018-01-09 17:10:18 -05:00
Nicole Thomas
d5b3ab5587
Merge pull request #45273 from twangboy/win_fix_zfs_grain
Fix issue with zfs_support grain on Windows
2018-01-09 16:35:54 -05:00
Nicole Thomas
12c0f99e8c
Merge pull request #45293 from terminalmage/py3-acl-auth-netapi
[PY3] Add unicode_literals to acl, auth, and netapi modules
2018-01-09 16:32:59 -05:00
Nicole Thomas
888557c8c8
Merge pull request #45304 from twangboy/win_add_pythonnet
Add pythonnet dependency for Windows
2018-01-09 16:32:17 -05:00
Nicole Thomas
56de7bcf5d
Merge pull request #45305 from terminalmage/py3-daemons
[PY3] Add unicode_literals to daemons modules
2018-01-09 16:30:36 -05:00
Nicole Thomas
4919b9f27d
Merge pull request #45335 from twangboy/win_fix_test_load_beacon
Skip test_load_match on Windows
2018-01-09 15:54:11 -05:00
Nicole Thomas
e402807cc0
Merge pull request #45332 from frogunder/fix_mac_archive_tests
fix test_archive tests for mac
2018-01-09 15:49:12 -05:00
Nicole Thomas
14bdb68afc
Merge pull request #45333 from twangboy/win_fix_comment_line
Fix `comment_line` for Py3 in Windows
2018-01-09 15:48:25 -05:00
Nicole Thomas
fb87010461
Merge pull request #45297 from Ch3LL/mac_service_state
Allow macosx service state tests to check for pid return
2018-01-09 15:47:23 -05:00
Nicole Thomas
bf38bdca6c
Merge pull request #45280 from rallytime/merge-oxygen
[oxygen] Merge forward from 2017.7 to oxygen
2018-01-09 15:37:52 -05:00
Gareth J. Greenaway
beedf6e815
Merge pull request #45351 from dmurphy18/upd_debbuild
Update debbuild to explicitly include source code for Debian, Ubuntu
2018-01-09 09:21:50 -08:00
David Murphy
478dc70092 Update debbuild flags 2018-01-09 10:10:51 -07:00