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 |
|
Nicole Thomas
|
503c7276e0
|
Merge pull request #44276 from rallytime/salt-cli-imports
Change some exception imports to match the others
|
2017-11-13 12:23:52 -05:00 |
|
Nicole Thomas
|
1da1a97d7d
|
Merge pull request #44490 from Ch3LL/ssh_ping
Enable test_deploy ssh test
|
2017-11-13 12:12:47 -05:00 |
|
Nicole Thomas
|
18624d6798
|
Merge pull request #44491 from Ch3LL/ssh_raw
Add salt-ssh raw integration tests
|
2017-11-13 10:47:11 -05:00 |
|
Nicole Thomas
|
aa17bfa8e7
|
Merge pull request #44492 from twangboy/win_skip_mode_check
Fix `unit.utils.test_cloud` for Windows
|
2017-11-13 10:44:30 -05:00 |
|
Nicole Thomas
|
f4757ca36b
|
Merge pull request #44502 from sjorge/PR43996
Additional comments required for PR #43996
|
2017-11-13 10:37:21 -05:00 |
|
Jorge Schrauwen
|
25b3c0bd15
|
Add the missing versionchanged info.
|
2017-11-12 20:38:08 +01:00 |
|
angeloudy
|
1b5a3a613c
|
Update zfs.py
|
2017-11-12 20:36:26 +01: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 |
|
Ch3LL
|
3dc8673417
|
change class name to raw
|
2017-11-10 14:47:42 -05:00 |
|
Ch3LL
|
308596ac8d
|
Add salt-ssh raw integration tests
|
2017-11-10 14:47:38 -05:00 |
|
Nicole Thomas
|
5b95495e75
|
Merge pull request #44484 from Ch3LL/orch_test
Add orchestration tests when target exists or not
|
2017-11-10 12:24:21 -07:00 |
|
Nicole Thomas
|
18ac000e15
|
Merge pull request #44482 from gtmanfred/develop
update kitchen yaml to use master for salt-jenkins
|
2017-11-10 12:16:30 -07:00 |
|
Nicole Thomas
|
0c4bb0b7e0
|
Merge pull request #44486 from vitaliyf/patch-1
Fixed minor spelling mistake.
|
2017-11-10 12:15:53 -07:00 |
|
Nicole Thomas
|
62c42ca6fb
|
Merge pull request #44480 from Ch3LL/override_pillar
Add integration pillar command line test
|
2017-11-10 12:14:31 -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
|
7949925ae6
|
Use tuple instead of list for joining
|
2017-11-10 19:50:47 +01:00 |
|
Bo Maryniuk
|
ec3e8211ef
|
Remove unused variable
|
2017-11-10 19:50:47 +01:00 |
|
Bo Maryniuk
|
ec8050ced2
|
Discard Git's spaghetti merger
|
2017-11-10 19:50:47 +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
|
629d1ddcce
|
Refactor file.line insert/ensure with after/before conditions
|
2017-11-10 19:50:47 +01:00 |
|
Bo Maryniuk
|
e0d05e5347
|
Refactor insert/ensure when after/before is known
|
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
|
c7a320ae8e
|
Make assert_occurrence return amount of occurrences
|
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
|
d98b3a59e8
|
Bugfix: keep indent of the "before" line.
|
2017-11-10 19:50:47 +01:00 |
|
Bo Maryniuk
|
a030b53fc7
|
Bugfix: content at the end should be added as a line, instead of merged to the rest of the data
|
2017-11-10 19:50:47 +01:00 |
|
Bo Maryniuk
|
218331c882
|
Bugfix: content at the beginning should be added as a line, instead of merged to the rest of the data
|
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
|
22e7ae2061
|
Fix: before/after together now define a range, where line will be added right before the last one within the range, i.e. before "before".
|
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
|
15fc88c46e
|
Bugfix: file.line insert=after
|
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 |
|