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
Bo Maryniuk
39126da5a2
Update unit test data
2017-11-10 19:50:46 +01:00
Bo Maryniuk
47fbe03c14
Add unit test for file._starts_till function
2017-11-10 19:50:46 +01:00
Bo Maryniuk
93e0df03a2
Fix docs in the funtions
2017-11-10 19:50:46 +01:00
Bo Maryniuk
599310e684
Fix docs for skipif decorator
2017-11-10 19:50:46 +01:00
Bo Maryniuk
d5d653af45
Add unit test for file.line on no location/before/after check failure
2017-11-10 19:50:46 +01:00
Bo Maryniuk
5b76c41f44
Move all file.line unit tests to the own class
2017-11-10 19:50:46 +01:00
Bo Maryniuk
f0f08a10e8
Add unit test for file.line on an empty content while not deleting anything
2017-11-10 19:50:46 +01:00
Bo Maryniuk
b5a80231bd
Rename a unit test and clarify its purpose in docs
2017-11-10 19:50:46 +01:00
Bo Maryniuk
c8452476ac
Rename long name variable, format a better error message
2017-11-10 19:50:46 +01:00
Bo Maryniuk
cf191b01d6
Add unit test for file.line on mode checks
2017-11-10 19:50:46 +01:00
Mike Place
8b834e341d
Merge pull request #44288 from eradman/onlyif_unless
...
Report 'onlyif' and 'unless' conditions as true or false
2017-11-10 11:37:01 -07:00
Mike Place
d753d8ba26
Merge pull request #44309 from cloudflare/http-logstash-eng
...
Improve the http_logstash engine
2017-11-10 11:34:27 -07:00
Mike Place
79eb8bbb4e
Merge pull request #44356 from skjaro/ipset-fix-subtypes-comma
...
Fix ipset state with multiple entries and subtypes separated with comma
2017-11-10 10:46:06 -07:00
Mike Place
7274824aca
Merge pull request #44481 from rallytime/stale-config-update
...
Reduce the number of days an issue is stale by 10
2017-11-10 10:03:47 -07:00
rallytime
caa0c54e9a
Reduce the number of days an issue is stale by 10
2017-11-10 11:24:42 -05:00
Nicole Thomas
519441e70f
Merge pull request #44448 from sjorge/zfsfuse
...
Simpler fallback check for zfs-fuse.
2017-11-10 08:14:12 -07:00
Nicole Thomas
75d26bf112
Merge pull request #44468 from DSRCorporation/bugs/mongo_users_do_not_fetch_twice
...
Do not perform the same request twice.
2017-11-10 08:13:30 -07:00
Erik Johnson
ec1c98f61d
Merge pull request #44445 from rallytime/fix-44435
...
Add a late-import for the salt.utils.master.py file in salt.auth
2017-11-10 07:03:48 -08:00
Nicole Thomas
d0ae909afc
Merge pull request #44442 from terminalmage/fix-leaked-filehandles
...
Use with blocks (or try/finally) to ensure filehandles are closed
2017-11-10 06:45:34 -07:00
Dmitry Kuzmenko
281f09d33a
Do not do the same request twice.
...
Found during code review. Originally there was 2 different functions to
check is user there and to fetch the users list. Then the first one was
replaced by more efficient that is the same that the second one.
Removed the unneeded second call.
2017-11-09 16:47:26 -07:00
Erik Johnson
1152f8ea08
Update reference to old salt.utils.which function
2017-11-09 15:06:25 -06:00
Erik Johnson
c1b6d35c0c
Python 3 compatibility fixes for kubernetes
...
dict.keys() is not a list in Python 3, and base64.b64encode requires
a bytestring.
2017-11-09 15:05:43 -06:00
Erik Johnson
b6ccfb45c8
Wait until after restoring original resource limit before removing temp files
...
Invoking shutil.rmtree() first was causing a traceback since the max
open files setting was still set very low for the test. This moves the
shutil.rmtree() until after we have restored the original resource
limit.
2017-11-09 15:05:43 -06:00
Erik Johnson
4eb248b129
Fix stacklevel in salt/utils/__init__.py
2017-11-09 15:05:43 -06:00
Erik Johnson
8a7d56369c
Use with blocks (or try/finally) to ensure filehandles are closed
...
This fixes a few sources (or potential sources) of filehandle leaks.
2017-11-09 15:05:40 -06:00
Jorge Schrauwen
624cff239e
Simpler fallback check for zfs-fuse.
...
This should fix #44447
2017-11-08 23:24:26 +01:00
Nicole Thomas
8e99aeed6a
Merge pull request #44415 from vernondcole/vagrant_cloud_minor_revisions
...
Vagrant and saltify cloud minor revisions
2017-11-08 15:22:18 -07:00
Nicole Thomas
2bf0df89cd
Merge pull request #44403 from eradman/swap_total
...
Implement swap_total grain on OpenBSD
2017-11-08 14:48:45 -07:00
Erik Johnson
5932e8a8ae
Merge pull request #44407 from rallytime/merge-develop
...
[develop] Merge forward from 2017.7 to develop
2017-11-08 11:50:05 -08:00
Eric Radman
26417d8e83
Add integration test for (mem|swap)_total grains on OpenBSD
2017-11-08 14:38:20 -05:00
rallytime
1c4042f438
Add a late-import for the salt.utils.master.py file in salt.auth
...
Fixes #44435
PR #43703 inadvertently moved a "late import" statement up to the
top of the auth file, which caused the problem reported in the PR
itself and issue #44435 .
Moving the salt.utils.master import lower down in the file fixes
the issue.
2017-11-08 12:03:27 -07:00
Nicole Thomas
5aaea7f2b4
Merge pull request #44424 from mtkennerly/bugfix/issue-44423-win-path-prepend
...
Fix #44423 : Handle index=None and index=0 distinctly in the win_path.exists state
2017-11-08 09:55:33 -07:00
Nicole Thomas
9d79551f11
Merge pull request #44433 from dave92082/fix-typo-in-lgpo-module
...
Fix typo in win_lgpo module
2017-11-08 09:53:13 -07:00
Matthew Kennerly
ca71d0e7c2
Merge branch 'develop' into bugfix/issue-44423-win-path-prepend
2017-11-07 20:59:32 -05:00
Nicole Thomas
aec80ee1e1
Merge pull request #44353 from prymitive/file-managed-test-changes
...
File managed test changes
2017-11-07 16:09:09 -07:00
Nicole Thomas
76f3c001ee
Merge pull request #44430 from thatch45/doc_fix1
...
make it clear that disabling the job cache is bad
2017-11-07 15:53:10 -07:00
