twangboy
72ac59c991
Fix some more integration tests for Linux
2017-12-04 14:05:53 -07:00
twangboy
3f0499cbc4
Fix some integration tests
2017-12-04 14:05:52 -07:00
twangboy
a24b964ea5
Fix unit test to handle new Exception
2017-12-04 14:05:52 -07:00
twangboy
e3c3845f73
Raise CommandExecutionError when file doesn't exist
...
Re-add CommandExecutionError in win_file
Add CommandExecutionError in file
Add Try/Except block in file when getting file metadata
2017-12-04 14:05:52 -07:00
twangboy
4602f499a2
Remove loader module mixin, add linux paths
2017-12-04 14:05:52 -07:00
twangboy
99b27c037f
Add tests to avoid future regression
2017-12-04 14:05:51 -07:00
twangboy
5c215ed8c2
Fix documentation formatting
2017-12-04 14:05:51 -07:00
twangboy
6a4e77e4b9
Return empty or unmodified dict on file not found
...
Fixes issue with file.managed with test=True when the directory
structure for the file is not there and makedirs=True
2017-12-04 14:05:51 -07:00
twangboy
068e463870
Fix lint, add integration tests
2017-12-04 13:29:37 -07:00
Nicole Thomas
ec2a8b2032
Merge branch '2017.7' into 42676_backport_44071
2017-12-04 11:52:38 -05:00
Bo Maryniuk
0d2675c4fe
Use variable, instead of direct value
2017-12-04 15:51:56 +01:00
Bo Maryniuk
1ddc47da0a
Add unit test for _get_pillar_errors when external pillar is clean and internal contains errors
2017-12-04 15:51:56 +01:00
Bo Maryniuk
68480d5dc9
Add unit test for _get_pillar_errors when both external and internal pillars contains errors
2017-12-04 15:51:56 +01:00
Bo Maryniuk
218a59e93b
Add unit test for _get_pillar_errors when external pillar has errors and internal is clean
2017-12-04 15:51:56 +01:00
Bo Maryniuk
3ce19356c2
Add unit test for _get_pillar_errors when external and internal pillars are clean
2017-12-04 15:51:56 +01:00
Bo Maryniuk
67034139d9
Fix unit test: wrong error types in side effect
2017-12-04 15:51:56 +01:00
Bo Maryniuk
d9359bca13
Bugfix: unit test mistakenly expects pillar errors as a string, while it is a list
2017-12-04 15:51:56 +01:00
Bo Maryniuk
8c2bdc696b
Bugfix: do not pull '_errors' from unchecked objects
2017-12-04 15:51:56 +01:00
Bo Maryniuk
d5e30999c7
Remove unused variable (no exception, within the try/finally block)
2017-12-04 15:51:56 +01:00
Bo Maryniuk
aad668d559
Fix and clarify docstring.
2017-12-04 15:51:56 +01:00
Bo Maryniuk
c2c47e4e71
Rename function from ambiguous name
2017-12-04 15:51:56 +01:00
Bo Maryniuk
265de8e61c
Bugfix the logic according to the exact described purpose of the function.
2017-12-04 15:51:56 +01:00
Nicole Thomas
4643a112e7
Merge pull request #44788 from kris-anderson/example-yaml-of-influxdb-user-state
...
Example yaml of influxdb_user state
2017-12-04 09:28:45 -05:00
Nicole Thomas
88c0d66b4e
Merge pull request #44794 from terminalmage/issue44365
...
Fix regression in file.managed when source_hash used with local file
2017-12-04 09:23:28 -05:00
Nicole Thomas
3b8b6f25e6
Remove debugging line
2017-12-04 09:22:44 -05:00
Kris Anderson
afd23d058c
converted yaml example to use 2 spaces
2017-12-03 21:14:12 -08:00
Nicole Thomas
4ebac09f60
Merge pull request #44735 from gracinet/42713_backport_2017.7
...
Backported issue #42713 to 2017.7
2017-12-03 20:43:22 -05:00
Erik Johnson
153bf45b03
Fix regression in file.managed when source_hash used with local file
...
This ensures that we enforce the passed source_hash when the source is a
file local to the minion.
2017-12-03 00:01:44 -06:00
Nicole Thomas
06ce7b7328
Merge pull request #44766 from twangboy/win_fix_test_process
...
Fix `unit.utils.test_process` for Windows
2017-12-02 08:15:52 -05:00
twangboy
a5737e8fc3
Fix lint errors
2017-12-01 16:45:18 -07:00
twangboy
be96de09cc
Fix pickling error by decorating
2017-12-01 16:45:18 -07:00
Thomas S Hatch
f8b8a8966d
Merge pull request #44716 from rallytime/bp-44605
...
Back-port #44605 to 2017.7
2017-12-01 16:12:23 -07:00
Thomas S Hatch
c8bb9dfbbb
Merge pull request #44738 from rallytime/bump-oxygen-warnings
...
Bump some deprecation warnings from Oxygen to Fluorine
2017-12-01 16:10:07 -07:00
Thomas S Hatch
88e3aab00d
Merge pull request #44741 from gtmanfred/rhip
...
if gateway is not specified use iface
2017-12-01 16:09:02 -07:00
Thomas S Hatch
8ed6287762
Merge pull request #44781 from cloudflare/thorium-fix-41869
...
Correct the thorium runner
2017-12-01 15:55:51 -07:00
Nicole Thomas
52596be102
Merge pull request #44466 from twangboy/win_fix_test_disk
...
Fix `unit.modules.test_disk` for Windows
2017-12-01 17:31:41 -05:00
twangboy
3df886df75
Fix lint, add gtmanfreds change
2017-12-01 14:41:00 -07:00
twangboy
16cb24614f
Add kcpassword functionality
...
There was a step missing in that we needed create/modify the
/etc/kcpassword file when we enable autologin. The file also needs to be
removed when autologin is disabled.
2017-12-01 14:41:00 -07:00
Gareth J. Greenaway
180971203e
Updating minion to respond to list_available events for beacons
2017-12-01 12:15:42 -08:00
Gareth J. Greenaway
db6fcefe62
Adding list_available which is used by the add function to verify that a becaon exists.
2017-12-01 12:15:42 -08:00
Gareth J. Greenaway
e9e0318bc6
Backporting fixes related to having beacons in pillar from #44071
2017-12-01 12:15:42 -08:00
rallytime
3d9eafc4bd
Lint: Remove extra empty lines at end of files
2017-12-01 14:46:27 -05:00
rallytime
817ac002b0
Add destructive test decorator to test class
...
Because the destructive test decorator was applied to the tearDown
function, the tests show a stacktrace instead of a nice skip message
when running without the `--run-destructive` flag. By applying the
decorator to the test class (since all tests are destructive anyway)
we can keep the output clean and still skip tests appropriately.
2017-12-01 14:33:38 -05:00
Kris Anderson
29e410c1ea
added a code-block example of how the yaml should be formatted
2017-12-01 11:31:08 -08:00
twangboy
5615862f23
Fix some lint
2017-12-01 10:25:48 -07:00
twangboy
627d5ab0c9
Mock salt.utils.which
...
cmd.run return values are mocked
2017-12-01 10:25:48 -07:00
twangboy
e5a96fe00f
Skip test_fstype on Windows
...
no lsblk on Windows
2017-12-01 10:25:48 -07:00
rallytime
239f3511bf
Merge branch '2016.11' into '2017.7'
...
Conflicts:
- salt/modules/reg.py
- salt/modules/state.py
- salt/modules/win_pkg.py
- salt/netapi/rest_cherrypy/app.py
- salt/utils/__init__.py
- tests/integration/modules/test_file.py
- tests/integration/output/test_output.py
- tests/unit/grains/test_core.py
2017-12-01 11:12:44 -05:00
Mircea Ulinic
83c73a69cb
Instance the Runner class instead of the RunnerClient as we're running on the Master
2017-12-01 15:50:07 +00:00
Nicole Thomas
b9ad4bba2d
Merge pull request #44719 from rallytime/bp-44667
...
Back-port #44667 to 2017.7
2017-12-01 10:20:48 -05:00
