Nicole Thomas
|
2c6f8f5f9e
|
Merge pull request #44510 from rallytime/merge-develop
[develop] Merge forward from 2017.7 to develop
|
2017-11-14 17:21:13 -05:00 |
|
Nicole Thomas
|
a5bb896ff1
|
Merge pull request #44340 from gracinet/42713_mine.get_back_compat
Backwards compat for mine.get on pre-Nitrogen minions
|
2017-11-13 16:49:51 -05:00 |
|
Erik Johnson
|
df972db3ba
|
Merge pull request #42930 from CorvinM/issue36942
Jinja line statements and comments
|
2017-11-13 12:02:16 -08:00 |
|
Mike Place
|
97863f338a
|
Merge pull request #43410 from skob/develop
queue.insert_runner with sqlite backend
|
2017-11-13 12:47:32 -07:00 |
|
Mike Place
|
28e1160c41
|
Merge pull request #43474 from kstreee/separate-key-dir-from-cache-dir
Separates 'key_dir' from 'cache_dir', The key files (i.e. '.root_key', '.sudo_ACCOUNT_NAME') must not be shared with other masters.
|
2017-11-13 12:41:28 -07:00 |
|
Mike Place
|
3af0031e02
|
Merge pull request #43504 from isbm/isbm-ansible-module-dev
Got Ansible own modules? Run them from within the Salt just like that!
|
2017-11-13 12:28:25 -07:00 |
|
Mike Place
|
dd2844a645
|
Merge pull request #44196 from benediktwerner/develop
Fix autosign file permission check [develop]
|
2017-11-13 11:34:37 -07:00 |
|
Mike Place
|
fef389d6ea
|
Merge branch 'develop' into 42713_mine.get_back_compat
|
2017-11-13 11:07:35 -07:00 |
|
rallytime
|
59ddde4671
|
Update old util paths to new paths
|
2017-11-13 12:35:31 -05:00 |
|
rallytime
|
4e2280157a
|
Merge branch '2017.7' into 'develop'
Conflicts:
- .kitchen.yml
- tests/unit/test_doc.py
- tests/unit/utils/test_cloud.py
|
2017-11-13 12:27:59 -05:00 |
|
Mike Place
|
bca50dedb0
|
Merge pull request #44361 from isbm/isbm-file.line-issues-devel
Long-awaiting set of unit tests and fixes for "file.line"
|
2017-11-10 16:37:56 -07:00 |
|
twangboy
|
2f30ad93b1
|
Skips mode check in Windows
|
2017-11-10 14:29:10 -07:00 |
|
Mike Place
|
8391b34372
|
Merge pull request #44148 from roaldnefs/add-telegram-returner
Add Telegram returner
|
2017-11-10 12:04:30 -07:00 |
|
Bo Maryniuk
|
f8c016cd48
|
Remove extra assertions
|
2017-11-10 20:02:04 +01:00 |
|
Bo Maryniuk
|
755bc35585
|
Fix value is not iterable error
|
2017-11-10 20:02:04 +01:00 |
|
Bo Maryniuk
|
56c52e6ab3
|
Fix TypeError for argument of type 'LoaderError' is not iterable
|
2017-11-10 20:02:04 +01:00 |
|
Bo Maryniuk
|
8f7ef4f45f
|
Lintfix: E9502
|
2017-11-10 20:02:04 +01:00 |
|
Bo Maryniuk
|
0594517a2e
|
Lintfix: E0102
|
2017-11-10 20:02:04 +01:00 |
|
Bo Maryniuk
|
7742037bcd
|
Don't bother with non-pytest unit tests
|
2017-11-10 20:02:04 +01:00 |
|
Bo Maryniuk
|
67cede713f
|
Add unit test for module loader failure
|
2017-11-10 20:02:04 +01:00 |
|
Bo Maryniuk
|
4004e2f53d
|
Add unit test for module loader
|
2017-11-10 20:02:04 +01:00 |
|
Bo Maryniuk
|
fd2fca0482
|
Improve module loader failure
|
2017-11-10 20:02:04 +01:00 |
|
Bo Maryniuk
|
25990f66bc
|
Add unit test resolver module loader failure
|
2017-11-10 20:02:04 +01:00 |
|
Bo Maryniuk
|
9d0762a8ee
|
Refactor to setup/teardown methods
|
2017-11-10 20:02:04 +01:00 |
|
Bo Maryniuk
|
630b654544
|
Add unit test for modules filtering
|
2017-11-10 20:02:04 +01:00 |
|
Bo Maryniuk
|
fc24371704
|
Do not use mock but real resolver class
|
2017-11-10 20:02:04 +01:00 |
|
Bo Maryniuk
|
082d47f2c1
|
Add unit test for documentation extractor
|
2017-11-10 20:02:04 +01:00 |
|
Bo Maryniuk
|
c7a1b733ab
|
Add scaffold for the unit test
|
2017-11-10 20:02:04 +01:00 |
|
Bo Maryniuk
|
b2ed7d0ecd
|
Mute pylint on misdetected regex-like strings that are actually just test data.
|
2017-11-10 19:50:47 +01:00 |
|
Bo Maryniuk
|
40f1e1d954
|
Rewrite unit tests for file.line on delete/replace an empty line
|
2017-11-10 19:50:47 +01:00 |
|
Bo Maryniuk
|
c2d9d8f8ea
|
Add unit test for file.line ensuring line between two lines but content already exists
|
2017-11-10 19:50:47 +01:00 |
|
Bo Maryniuk
|
9963895719
|
Add unit test for file.line ensuring line inside the range of lines
|
2017-11-10 19:50:47 +01:00 |
|
Bo Maryniuk
|
1e1f5e5a6f
|
Add unit test for file.line ensuring line between two other lines nearby
|
2017-11-10 19:50:47 +01:00 |
|
Bo Maryniuk
|
59de17b260
|
Add unit test for file.line on calling insert/ensure after specific line
|
2017-11-10 19:50:47 +01:00 |
|
Bo Maryniuk
|
710481b25e
|
Add unit test for file.line when calling insert/ensure mode
|
2017-11-10 19:50:47 +01:00 |
|
Bo Maryniuk
|
b42b762c57
|
Add unit test for file.line when inserting a line at the end of the file (append functionality)
|
2017-11-10 19:50:46 +01:00 |
|
Bo Maryniuk
|
80c40bbb11
|
Remove irrelevant issue number
|
2017-11-10 19:50:46 +01:00 |
|
Bo Maryniuk
|
c95b3e031c
|
Add unit test about file.line for insert/start
|
2017-11-10 19:50:46 +01:00 |
|
Bo Maryniuk
|
926372574d
|
Remove irrelevant issue number from the docstring
|
2017-11-10 19:50:46 +01:00 |
|
Bo Maryniuk
|
b4cd4bd165
|
Add unit test for file.line replacement
|
2017-11-10 19:50:46 +01:00 |
|
Bo Maryniuk
|
9a72761dc6
|
Add unit test for file.line delete by direct match or regular expression
|
2017-11-10 19:50:46 +01:00 |
|
Bo Maryniuk
|
60185f578e
|
Add unit test for file.line usage together with before/after
|
2017-11-10 19:50:46 +01:00 |
|
Bo Maryniuk
|
fc79a546dd
|
Rename unit test
|
2017-11-10 19:50:46 +01:00 |
|
Bo Maryniuk
|
d1a41dd7bd
|
Add unit test file.line insert before line
|
2017-11-10 19:50:46 +01:00 |
|
Bo Maryniuk
|
1ea7e33605
|
Harden unit test for 'after pattern' scenario
|
2017-11-10 19:50:46 +01:00 |
|
Bo Maryniuk
|
bde3611f08
|
Remove unnecessary code
|
2017-11-10 19:50:46 +01:00 |
|
Bo Maryniuk
|
fdffbe47b0
|
Add unit test for using patterns for line matching
|
2017-11-10 19:50:46 +01:00 |
|
Bo Maryniuk
|
ed171176a8
|
Rename unit test while using no patterns
|
2017-11-10 19:50:46 +01:00 |
|
Bo Maryniuk
|
d08307f53b
|
Add unit test for file.line insert=after
|
2017-11-10 19:50:46 +01:00 |
|
Bo Maryniuk
|
39126da5a2
|
Update unit test data
|
2017-11-10 19:50:46 +01:00 |
|