valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 17:33:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
68,194 Commits 24 Branches 182 Tags 341 MiB
318c2ed6a1
Commit Graph

3967 Commits

Author SHA1 Message Date
Evan Borgstrom
6bbac64d3a Add test to prove that recursive imports are currently broken 
Refs #30465

This also exposes some other issues with the Registry being in an
inconsistent state when an exception occurs when we are rendering.
 2016-01-20 11:22:51 -08:00
Evan Borgstrom
b46df0e4b5 Allow recursive salt:// imports 
Fixes #30465
 2016-01-20 11:20:50 -08:00
Mike Place
7b88d721a5 Merge pull request #30368 from lyft/boto_dynamodb 
Update boto_dynamodb module and state
 2016-01-20 11:23:15 -07:00
Evan Borgstrom
51bfa16173 Add test to prove that recursive imports are currently broken 
Refs #30465

This also exposes some other issues with the Registry being in an
inconsistent state when an exception occurs when we are rendering.
 2016-01-20 09:57:16 -08:00
Quan Tong Anh
234faa5991 launchctl: update test function accordingly 2016-01-20 08:55:56 +07:00
Zack Hsi
fbff36df36 Fix unit test 2016-01-19 16:06:07 -08:00
Sean Jenkins
e44a30620b Remove recurse_list from pillar_source_merging_strategy and add pillar_merge_list (bool) instead 2016-01-19 15:06:30 -07:00
justinta89
00943ff1e6 Boto uses False for is_default instead of None 2016-01-19 10:15:35 -07:00
justinta89
2f77152479 Boto uses False for is_default instead of None 2016-01-19 10:12:11 -07:00
rallytime
39b49621ad Merge branch '2015.8' into 'develop' 
Conflicts:
  - salt/beacons/service.py
  - salt/cloud/clouds/vmware.py
  - salt/modules/file.py
  - salt/modules/ipset.py
  - salt/modules/npm.py
  - salt/modules/rpm.py
  - salt/states/file.py
  - salt/utils/event.py
  - salt/utils/schedule.py
  - tests/unit/modules/state_test.py
 2016-01-14 13:33:53 -07:00
Mike Place
d5b8776355 Merge pull request #30340 from jtand/seed_test_fix 
Updated seed_test.py for changes made to seed module
 2016-01-13 15:50:34 -07:00
Mike Place
c5d1365a36 Merge pull request #30331 from alprs/feature-patch_dir 
Make file.patch work with directories
 2016-01-13 14:34:58 -07:00
Mike Place
09b144aa98 Merge pull request #30327 from kraney/boto_cloudtrail 
Support for AWS CloudTrail
 2016-01-13 13:18:06 -07:00
Andreas Lutro
b73ee448f0 fix command args list 2016-01-13 20:59:10 +01:00
Mike Place
10b5728f84 Merge pull request #30308 from rallytime/bp-30257 
Back-port #30257 to 2015.8
 2016-01-13 12:20:13 -07:00
justinta89
ee764ee952 Updated seed_test.py for changes made to seed module 2016-01-13 11:58:05 -07:00
Andreas Lutro
d8b499b7c5 Make file.patch work with directories 
In the process, make the "hash" argument optional.

Closes #29619
 2016-01-13 19:15:21 +01:00
Mike Place
ded14dcead Merge pull request #30263 from kiorky/mysql 
fix quoting
 2016-01-13 10:48:20 -07:00
Mike Place
dcfba51556 Lint 2016-01-13 10:42:03 -07:00
Mike Place
b9921128af Kill pointless tests 2016-01-13 10:15:26 -07:00
Kris Raney
8ab4938f48 Pylint fixes 2016-01-13 11:11:26 -06:00
Mike Place
63c157d0a3 Fix test_managed 2016-01-13 09:54:33 -07:00
Kris Raney
d30212f180 Add tag support to boto_cloudtrail 2016-01-13 10:13:05 -06:00
Mathieu Le Marec - Pasquet
22963e50f8 fix mysql tests 2016-01-13 10:12:53 +01:00
abednarik
deeeb71dda Add test in npm state. 
Updated nmp module to append --dry-run when executing nmp state in test mode.

Fixes #30250.
 2016-01-12 14:30:32 -07:00
Kris Raney
6fa7c84ec2 Initial cloud trail state support 2016-01-12 15:20:24 -06:00
Kris Raney
549d0b8d8b Module functionality for support of state module 2016-01-12 15:19:31 -06:00
Jacob Hammons
53d17f1f85 Changed examples to use the "example.com" domain instead of "mycompany.com" or "company.com" 2016-01-12 13:37:09 -07:00
Kris Raney
0d211a4fd5 Basic CloudTrail module 2016-01-12 13:13:19 -06:00
Mike Place
2c62b464b1 Accept whatever comes into hightstate mock for state tests 2016-01-12 11:30:25 -07:00
Mike Place
11d27ba694 Mock config module in utils test 2016-01-11 16:31:21 -07:00
Mike Place
cf440036dd Remove unused import 2016-01-11 14:14:50 -07:00
Mike Place
36d55ea0ad Allow modules to be packed into boto utils 
A workaround to allow modules to be packed into the namespace for the boto utils.
 2016-01-11 14:13:07 -07:00
abednarik
128ded881f Add test in npm state. 
Updated nmp module to append --dry-run when executing nmp state in test mode.

Fixes #30250.
 2016-01-11 17:05:12 -03:00
Daniel Hobley
85862a2f6e Added user requirement to the glxinfo beacon 2016-01-07 15:49:32 +01:00
Mike Place
70681bf03b Fix for mock state PR #30118 2016-01-06 15:10:19 -07:00
Mike Place
3dd4d05a4b Merge pull request #30185 from cachedout/fix_30118 
Fix #30118
 2016-01-06 14:02:56 -07:00
Mike Place
180582a523 Fix for mock state PR #30118 2016-01-06 14:01:43 -07:00
Colton Myers
f476c75fad Merge pull request #30062 from seanjnkns/develop 
Remove recurse_list from pillar_source_merging_strategy and add pilla…
 2016-01-06 10:27:35 -07:00
Daniel Hobley
9f416ef0e4 Added beacon for checking if a linux minion has a screen attached 
- Added unit tests
 2016-01-06 13:55:38 +01:00
Colton Myers
8bc5506c08 Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 
Conflicts:
    doc/topics/installation/rhel.rst
    salt/modules/pacman.py
    salt/modules/pkgng.py
    salt/modules/win_update.py
    salt/states/boto_elb.py
    salt/states/file.py
 2016-01-05 16:19:32 -07:00
Mike Place
9ef4bb3b46 Merge pull request #30132 from akissa/add-support-for-custom-augeas-lense-paths 
Add support for augeas loading of non stock lenses
 2016-01-04 13:36:07 -07:00
Mike Place
5419699bd2 Merge pull request #30075 from iodatacenters/2015.8_gluster_usexml 
Convert glusterfs module to use xml
 2016-01-04 13:33:58 -07:00
Mike Place
fff6bf1970 Merge pull request #30041 from kraney/boto_iot 
Support for AWS IoT
 2016-01-04 13:04:06 -07:00
Joe Julian
01a8e7ee10 Convert glusterfs module to use xml 
The gluster cli has the option to produce xml output from most every
command, and to avoid pausing for questions when being run in script
mode. Make use of that capability and avoid scraping text output that is
often subject to change between versions.

This should help future-proof this module as any changes to the xml
output should be automatically integrated.

As part of this change, I added a glusterfs.info function and added the
force keywords to volume start and volume stop.

Fixes #30051
 2016-01-04 09:47:59 -08:00
Andrew Colin Kissa
a8fe0df0ac Add support for augeas loading of non stock lenses 
Fixes #30131

Pylint cleanup

Updated tests
 2016-01-04 14:48:44 +02:00
Andrew Colin Kissa
a3e786a03e add check_password execution module function 
fix rabbitmq_user.present is not idempotent

Fixes #30119
 2016-01-01 22:49:13 +02:00
Kris Raney
86568c9e4f Another pylint error 2015-12-31 14:30:01 -06:00
Kris Raney
08987a1698 Fix new lint warning 2015-12-30 22:43:38 -06:00
Kris Raney
26ded33d79 Reproduced the no-boto problem and fixed it. 2015-12-30 22:08:35 -06:00
Kris Raney
1fb44b0925 Try again to deal with missing boto 2015-12-30 20:46:01 -06:00
Kris Raney
ee052615d1 Fix case when boto is not present 2015-12-30 16:34:58 -06:00
Sean Jenkins
fb6e895bf0 Merge remote-tracking branch 'upstream/develop' into develop 2015-12-30 09:43:05 -07:00
Mike Place
d09e69f3fc Merge pull request #30057 from abednarik/virtual_ret_parted_module 
modules.parted: __virtual__ return err msg.
 2015-12-30 08:57:55 -07:00
Sean Jenkins
1d7ee7bed2 Merge remote-tracking branch 'origin/develop' into sean 2015-12-30 08:44:30 -07:00
rallytime
c386d70742 Merge branch '2015.8' into 'develop' 
Conflicts:
  - salt/modules/alternatives.py
  - salt/modules/boto_rds.py
  - salt/modules/mount.py
  - salt/states/boto_iam.py
 2015-12-29 15:51:12 -07:00
rallytime
f7e58a241c Merge branch '2015.5' into '2015.8' 
Conflicts:
- salt/modules/boto_vpc.py
- tests/unit/modules/boto_vpc_test.py
 2015-12-29 15:27:03 -07:00
abednarik
c1be5a61fa modules.parted: __virtual__ return err msg. 
Updated message when module is not supported based on systems or available binaries.
 2015-12-29 16:55:48 -03:00
Sean Jenkins
41353b7ab3 Remove recurse_list from pillar_source_merging_strategy and add pillar_merge_list (bool) instead 2015-12-29 10:22:54 -07:00
Mike Place
bad6daca93 Merge pull request #30049 from rallytime/esxi-unit-tests 
Add some more unit tests for the vsphere execution module
 2015-12-29 10:07:41 -07:00
Mike Place
e915f4b591 Merge pull request #30053 from akissa/add-postgres-privileges-support 
Add postgres privileges support
 2015-12-29 09:50:44 -07:00
Andrew Colin Kissa
7be5eebfc7 add postgres_privileges state module tests 2015-12-29 12:57:21 +02:00
Andrew Colin Kissa
efcfb611b2 added postgres execution privileges tests 2015-12-29 10:59:48 +02:00
rallytime
1a83147986 Remove unnecessary import block 2015-12-28 16:14:13 -07:00
rallytime
695107ae6e Add some more unit tests for the vsphere execution module 
And fix a coupl of small bugs found in the module through testing
 2015-12-28 16:11:33 -07:00
Mike Place
5cfda08b39 Merge pull request #29970 from sjorge/module-zfs 
salt.modules.zfs
 2015-12-28 14:38:37 -07:00
Mike Place
28e01aa8ac Merge pull request #30018 from gladiatr72/pip_state__handle_requirements_chaining 
Pip module/state -- handle requirements chaining
 2015-12-28 14:28:00 -07:00
Kris Raney
3dea1a3589 Sometimes 'no whitespace after comma' actually means 'no whitespace after _colon_'. 2015-12-28 15:14:27 -06:00
Kris Raney
2fe5d8fbb4 Fix pylint errors 2015-12-28 14:46:43 -06:00
Jorge Schrauwen
4bad71c60d lint fixes 2015-12-28 19:48:51 +00:00
Kris Raney
85d59865a6 Merge branch 'develop' into boto_iot 2015-12-28 13:45:35 -06:00
Andreas Lutro
ca290ec3e1 change how alternatives states check for installed 2015-12-28 12:31:19 -07:00
Stephen D. Spencer
e0da7cddf6 modules.pip: 
adjust (actual) current directory bits

tests.unit.modules.pip_test:
    adjust mock's expectations of cwd=None always being passed (?)
 2015-12-28 09:37:39 +00:00
justinta89
e706642152 Skipping some Boto tests until resolved moto issue 
Similar to #29725. Though, some of the tests are different, due to the older
branch. I'm not condisidering this a backport because of that.
 2015-12-27 22:34:09 -07:00
Andrew Colin Kissa
2e836a3f75 postgres_privileges skeleton 2015-12-27 12:01:20 +02:00
Andreas Lutro
4c9d893f98 change how alternatives states check for installed 2015-12-26 22:48:29 +01:00
Jorge Schrauwen
e1445d42e9 update unit tests for new error messages 2015-12-26 10:28:25 +00:00
Jorge Schrauwen
bc15891944 added unit test for zfs.get 2015-12-24 00:07:36 +00:00
Jorge Schrauwen
59efba23aa added test for zfs.set 2015-12-23 23:22:09 +00:00
Kris Raney
bd6cda504e boto_iot state unit tests. 2015-12-23 16:54:29 -06:00
Jorge Schrauwen
87f27d206c added unit tests for zfs.snapshot 2015-12-23 22:44:19 +00:00
Jorge Schrauwen
0a1dbeda53 added unit tests for zfs.release, fixed unit test for zfs.hold 2015-12-23 22:06:44 +00:00
Jorge Schrauwen
9db9843bae added unit tests for zfs.hold 2015-12-23 21:50:01 +00:00
Jorge Schrauwen
596c991c0b added unit tests for zfs.holds 2015-12-23 21:16:45 +00:00
Kris Raney
c516e65333 Implement boto_iot module 2015-12-23 14:13:48 -06:00
Jorge Schrauwen
26c00bf402 added unit test for zfs.bookmark, probably need to revisit this once the error messages are more useful. Now they all seem to return unknown error from the upstream command 2015-12-23 20:12:07 +00:00
Jorge Schrauwen
f2dccea3d1 add unit test for zfs.promote 2015-12-23 17:19:34 +00:00
Jorge Schrauwen
b7314cd186 add unit test for zfs.clone 2015-12-23 17:06:22 +00:00
Jorge Schrauwen
032f17cfd1 implement unit tests for zfs.rollback 2015-12-23 16:48:24 +00:00
Jorge Schrauwen
c15affe227 add unit test for zfs.diff 2015-12-23 16:20:32 +00:00
Jorge Schrauwen
0d8fd711b5 add unit tests for zfs.inherit 2015-12-23 15:59:50 +00:00
Jorge Schrauwen
959828a9dd add unit tests for zfs.unmount 2015-12-23 15:36:33 +00:00
Jorge Schrauwen
11b986e715 unit test for zfs.list 2015-12-23 15:20:51 +00:00
Jorge Schrauwen
3cbc6befbe update unit tests for zfs.mount 2015-12-23 15:14:45 +00:00
Jorge Schrauwen
388f928851 unit test for zfs module should accept new output 2015-12-23 12:47:41 +00:00
Jorge Schrauwen
95a1668bc1 fix type in test data 2015-12-22 21:21:07 +00:00
Mike Place
c19782a184 Merge pull request #29853 from basepi/merge-forward-develop 
Merge forward from 2015.8 to develop
 2015-12-22 08:05:49 -07:00
Mike Place
62c9514108 Merge pull request #29881 from sjorge/module_zpool 
rework salt.module.zpool
 2015-12-21 14:51:10 -07:00
Jorge Schrauwen
1ca3757782 tests now cover most commands that query data 2015-12-21 20:44:10 +00:00
Jorge Schrauwen
08b65e79ac add a few more unit tests 2015-12-21 20:40:28 +00:00
Jorge Schrauwen
37ac0df4e3 also test zpool.status 2015-12-21 20:19:03 +00:00
Jorge Schrauwen
21ee4b71b6 also do negative test 2015-12-21 20:07:48 +00:00
Jorge Schrauwen
28c4d28446 attempt to fix unit test 2015-12-21 19:49:40 +00:00
Mike Place
fa7dead492 Merge pull request #29901 from cachedout/fixup_29863 
Fixup 29863
 2015-12-21 11:26:00 -07:00
Mike Place
0d7ef0e95c Fix broken tests 2015-12-21 11:25:18 -07:00
Mike Place
23bffbb623 Merge pull request #29875 from akissa/add-postgres_language-state 
Add PostgreSQL Language management functionality
 2015-12-21 10:39:46 -07:00
Mike Place
207bb5af0c Merge pull request #29830 from terminalmage/issue29064 
Optimizations/bugfixes/feature adds for systemd execution module
 2015-12-21 10:37:36 -07:00
Mike Place
4f46255044 Merge pull request #29856 from rallytime/esxi-unit-tests 
Added some initial unit tests for the salt.modules.vsphere.py file
 2015-12-21 10:12:20 -07:00
Andrew Colin Kissa
f921a88a30 lint 2015-12-20 20:41:40 +02:00
Andrew Colin Kissa
a826720371 Add PostgreSQL Language management functionality 
Fixes #29874
 2015-12-20 09:37:41 +02:00
rallytime
b908ebd123 Added some initial unit tests for the salt.modules.vsphere.py file 
More will follow to cover the remaining functions.
 2015-12-18 16:18:01 -07:00
Colton Myers
95fe811724 Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 
Conflicts:
    salt/minion.py
    salt/modules/network.py
    salt/scripts.py
    salt/states/file.py
    salt/states/git.py
    salt/utils/event.py
 2015-12-18 15:00:24 -07:00
Erik Johnson
15047918a9 systemd test fixes 
This removes a bunch of tests that don't test anything (see https://github.com/saltstack/salt/issues/29852).

It also changes some of the tests to reflect recent changes in
systemd.py.
 2015-12-18 15:17:38 -06:00
Andrew Colin Kissa
98593a94d5 fix various bugs in augeas modules 
Fixes #29842
 2015-12-18 23:01:44 +02:00
lburg
6d1ab2ece0 states.timezone: Fix 'desrired' typo 2015-12-18 13:54:04 +01:00
Andreas Lutro
51088d938a add tests, rename a function to more closely mirror influxdb 2015-12-17 21:58:51 +01:00
Andrew Colin Kissa
b749b9faba Add Pillar SQLCipher module 
Fixes #29781
 2015-12-17 09:48:27 +02:00
Mike Place
aab929d196 Merge pull request #29718 from thusoy/issue-29423 
Support match-sets in iptables module
 2015-12-16 07:48:18 -07:00
Tarjei Husøy
387ac2ce5e Support match-sets in iptables module 
Based on work by @l13t in https://github.com/saltstack/salt/pull/29426.

Added tests and fixed incorrect appending of the built rule.

Closes #29423.
 2015-12-15 16:35:06 -08:00
Mike Place
d19827fd3a Disable some boto tests per resolution of moto issue 
Pending resolution of https://github.com/spulec/moto/issues/493
 2015-12-15 14:59:14 -07:00
Mike Place
a2b1f41f49 Disable some boto tests per resolution of moto issue 
Pending resolution of https://github.com/spulec/moto/issues/493
 2015-12-15 14:57:52 -07:00
Colton Myers
5ac96cc8ba Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 
Conflicts:
    salt/client/ssh/ssh_py_shim.py
    salt/modules/tls.py
    salt/states/git.py
    salt/transport/tcp.py
 2015-12-14 15:56:26 -07:00
Alexandre Garnier
f3a2b27671 Fix deb_apache states methods tense 2015-12-13 13:58:27 +01:00
Mike Place
8b336dc1b4 Merge pull request #29638 from cachedout/fix_29535 
Fix 29535
 2015-12-11 13:37:42 -07:00
Mike Place
5bda5ff664 Updated pip module internal check for log. 2015-12-11 13:36:51 -07:00
Mike Place
3514765d33 Merge pull request #29573 from kraney/boto_lambda 
An implementation of support for AWS Lambda
 2015-12-10 13:01:26 -07:00
Kris Raney
c024ca70b1 A few missed lint errors 2015-12-09 16:52:10 -06:00
Kris Raney
4e04c3fbbd Fix lint warnings, add log when using default region 2015-12-09 16:03:20 -06:00
Kris Raney
f33d7a761c Fix unit test to work with code that understands FunctionArn 2015-12-09 12:49:27 -06:00
Mike Place
78fa3111a7 Merge pull request #29571 from cachedout/lint_29493 
Lint #29493
 2015-12-09 09:28:17 -07:00
Mike Place
ab439e9173 Lint 2015-12-09 09:27:12 -07:00
Andreas Lutro
7c69c177ed update test 2015-12-09 13:18:47 +01:00
Justin Findlay
45acd05065 state.file: add file.mkdir to unit test mock 2015-12-08 16:33:33 -07:00
Justin Findlay
aa393a4831 state.file: add pchanges to unit test mock 2015-12-08 16:33:07 -07:00
Kris Raney
591e2756cc Add tests for boto_lambda states. 2015-12-08 16:20:31 -06:00
Colton Myers
7918736656 Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 
Conflicts:
    salt/client/ssh/ssh_py_shim.py
    salt/modules/dracr.py
    salt/states/boto_vpc.py
    tests/unit/states/file_test.py
 2015-12-08 14:46:23 -07:00
Colton Myers
e59364ad1d Fix failing unit test 2015-12-08 13:45:34 -07:00
Kris Raney
bda53f74a4 Full unit test coverage for lambda module 2015-12-08 13:33:28 -06:00
Andreas Lutro
36e493cadf lint - tabs to spaces, oops 2015-12-08 20:24:45 +01:00
Colton Myers
9673fd0937 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 
Conflicts:
    salt/cloud/clouds/ec2.py
    tests/unit/states/file_test.py
 2015-12-08 12:23:26 -07:00
Kris Raney
f98791054e Lambda function unit test cases 2015-12-08 10:15:11 -06:00
Mike Place
95523312a0 Merge pull request #29512 from dr4Ke/fix_remount_cifs_uid_name 
Fix forced remount if uid/gid is provided as a name
 2015-12-08 09:08:33 -07:00
Christophe Drevet-Droguet
9a268e05d6 mount exec module: resolve user/group names in opts 
In relation to #25293, it solves the improbable case where the OS returns the
mount options as names instead of numeric ids. The module converts these names
to numeric ids before returning the opts.

This is done only for uid= and gid= opts, for now. It can be extended to others.
 2015-12-08 12:43:47 +01:00
Christophe Drevet-Droguet
7395a949e4 mount state module: uid/gid verification with names 
Should fix #25293
 2015-12-08 12:43:46 +01:00
Mike Place
87fb8baad1 Merge pull request #29294 from skizunov/develop2 
ZeroMQ no longer required when transport is TCP
 2015-12-07 21:59:44 -07:00
Nicole Thomas
df90c406ba Merge pull request #29462 from techhat/genesispart 
Create partitioned, bootable images
 2015-12-07 19:28:24 -07:00
Sergey Kizunov
a37a2700af ZeroMQ no longer required when transport is TCP 
salt/master.py:
- If ZMQ is not importable, use `tornado.ioloop.IOLoop` as the loop class.
- Check HAS_ZMQ before using any zmq.* content.
- Did not touch `FloMWorker` usage of zmq.*. This is only used when the
transport is RAET.

salt/minion.py:
- If ZMQ is not importable, use `tornado.ioloop.IOLoop` as the loop class.
- Check HAS_ZMQ before using any zmq.* content.

salt/transport/ipc.py:
- Added `IPCMessagePublisher`. This is intended to function much like
ZMQ's zmq.PUB sockets. Used in implementing utils/event.py to function
without ZMQ.
- Added `IPCMessageSubscriber`. This is intended to function much like
ZMQ's zmq.SUB sockets. Used in implementing utils/event.py to function
without ZMQ. What makes this class a bit different is that the associated
IO Loop is meant to not be running when it is used. Due to this, it is
recommended that the caller create a new IO Loop for this purpose. The
reason for this is that the `get_event()` API may be invoked from
anywhere, whether or not there is a current IO Loop that is running in
the thread of the invocation.

salt/utils/async.py:
- If ZMQ is not importable, use `tornado.ioloop.IOLoop` as the loop class.

salt/utils/event.py:
- Implemented using `salt.transport.ipc` instead of ZMQ.
- zmq.PUB ==> `IPCMessagePublisher`
- zmq.SUB ==> `IPCMessageSubscriber`
- zmq.PUSH ==> `IPCMessageClient`
- zmq.PULL ==> `IPCMessageServer`

Signed-off-by: Sergey Kizunov <sergey.kizunov@ni.com>
 2015-12-07 20:22:16 -06:00
Justin Findlay
99b229c9fe modules.genesis: update unit tests for bootstrap 2015-12-07 15:19:22 -07:00
Andreas Lutro
edf2a3098e remove "2" from state name 2015-12-07 21:54:16 +01:00
Andreas Lutro
00b6eb5907 add tests, clean up/fix logic 2015-12-07 21:52:22 +01:00
Mike Place
7efd6dd140 Merge pull request #29399 from jfindlay/second_up 
modules.status: add human_readable option to uptime
 2015-12-07 12:53:52 -07:00
Joseph Hall
bb6e2d5a8a Adding tests for disk.blkid 2015-12-07 08:52:06 -07:00
Christophe Drevet-Droguet
4a00cc5b70 cron: support for commented cron jobs 
This change is an implementation for managing commented cron jobs.

Before that, commented cron jobs were not manageable by salt. They were ignored
at reading, and thus lost while writing the new crontab.
This is described in issue #29082, which should be fixed now.

There is a new `commented` parameter, defaulting to False. The cron job is
set like any other, but is prefixed by `#DISABLED#`.
 2015-12-07 15:40:36 +01:00
Justin Findlay
48e7beb0eb modules.status: add in_seconds option to uptime 
Implements #29311.
 2015-12-04 18:52:59 -07:00
Justin Findlay
ca69a646d6 modules.genesis.bootstrap: update unit tests 2015-12-04 18:44:42 -07:00
Kris Raney
be58e095d4 Avoid leaving zip files scattered around after tests. 2015-12-04 14:23:40 -06:00
Mike Place
00cbcb9f3b Lint test case 2015-12-04 12:43:14 -07:00
Mike Place
0c6852e67d Fix augeas test 2015-12-04 08:37:01 -07:00
Kris Raney
6a208dca84 Start unit tests for boo_lambda 2015-12-03 21:09:48 -06:00
Mike Place
af1c327461 Fix augeas_cfg test 2015-12-03 13:54:43 -07:00
Mike Place
d2c0fcbc97 Merge pull request #29398 from cachedout/lint_29288 
Lint 29288
 2015-12-03 11:03:53 -07:00
Mike Place
3b0033e529 Lint #29288 2015-12-03 11:02:49 -07:00
Mike Place
17d80c051a Merge pull request #29334 from rallytime/bp-29237 
Back-port #29237 to 2015.8
 2015-12-02 12:37:31 -07:00
Mike Place
2607246686 Merge pull request #29321 from techhat/sparsegenesis 
Handle sparse files
 2015-12-02 12:36:28 -07:00
Mike Place
5ec7947595 Merge pull request #29300 from ticosax/dockerng-volumes 
[dockerng] Add support for volume management in dockerng
 2015-12-02 10:48:53 -07:00
Mike Place
eda0cffee5 Merge pull request #29338 from cachedout/fixup_28815 
Fixup 28815
 2015-12-02 10:47:25 -07:00
Mike Place
7b11eb0d67 Fixup test for #29321 2015-12-02 10:45:01 -07:00
Mike Place
f2bf2dff14 Adjust test for syndic config 
Refs #28115
 2015-12-02 09:35:48 -07:00
Nicolas Delaby
cb9cb463b0 Provide states for managing docker volumes 2015-12-02 17:27:20 +01:00
Nicolas Delaby
dff6fa1fb2 Add execution module to manage docker volumes 2015-12-02 17:27:20 +01:00
Jorge Schrauwen
598226def1 fix unit test (attempt 1) 2015-12-02 08:34:59 -07:00
Mike Place
99b7d87688 Merge pull request #29218 from clan/service_state 
check service enable state in test mode
 2015-12-02 08:31:00 -07:00
Mike Place
b96552b716 Merge pull request #29304 from sbz/monit-module-changes 
modules/monit: complete monit execution module functions
 2015-12-02 07:50:56 -07:00
Colton Myers
3f09d58fff Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 
Conflicts:
    salt/cloud/clouds/vmware.py
    salt/modules/rh_ip.py
    salt/modules/s3.py
    salt/modules/saltutil.py
    salt/modules/zypper.py
    salt/spm/__init__.py
    salt/utils/aws.py
    salt/utils/s3.py
    tests/unit/modules/s3_test.py
    tests/unit/pydsl_test.py
 2015-12-01 15:31:03 -07:00
Justin Findlay
60bd5781ef Merge pull request #29312 from sjmh/fix/etcd_watch_valerr 
Catch ValueError on timeout on non-existing key
 2015-12-01 13:55:41 -07:00
Sofian Brabez
a2e5586cd4 modules/monit: alias reload function also and fix lint issues 2015-12-01 21:42:56 +01:00
Steve Hajducko
cef6eff7c8 Catch ValueError on timeout on non-existing key 
The etcd watch function tries to read a key when it reaches the timeout
in order to obtain details about the key.

On python 2.6, when it tries to re-read the key, it throws a ValueError,
since python-etcd doesn't officially support python 2.6.  The watch
function wasn't catching this ValueError, so it was returning the
exception, rather than a blank dict.
 2015-12-01 10:30:45 -08:00
Mike Place
a890307cc0 Merge pull request #29310 from cachedout/fixup_spmverbose 
Fixup spmverbose
 2015-12-01 11:28:07 -07:00
Mike Place
cdde617be3 Fixup test for spm verbose PR 
Refs #29274
 2015-12-01 11:27:03 -07:00
Justin Findlay
4d6c71aa80 modules.glusterfs: fix start_volume unit test 2015-12-01 10:53:32 -07:00
Sofian Brabez
539fd52220 modules/monit: complete monit execution module functions 
add new functions configtest(), id(), reload(), version() and validate()
to the monit execution module
 2015-12-01 17:33:52 +01:00
Z. Liu
a1250a9729 check service enable state in test mode 2015-12-01 15:02:00 +08:00
Mike Place
84c36ec92f Merge pull request #29259 from Unity-Technologies/feature/beacon-adb 
Add beacon for android devices
 2015-11-30 15:30:18 -07:00
Mike Place
8d32d8d43d Merge pull request #29264 from alprs/fix-ssh_auth_absent_test 
Prevent ssh_auth.absent from running when test=True
 2015-11-30 14:54:15 -07:00
Mike Place
87e4aa4fae Merge pull request #28994 from timcharper/2015.8.1-dev 
add support to s3 for aws role assumption
 2015-11-30 13:52:17 -07:00
Mike Place
aa741b7015 Merge pull request #29176 from woodrow/elb-backend-policy-management 
Allow boto_elb to manage ELB backend policies.
 2015-11-30 13:36:44 -07:00
Daniel Hobley
24a3a98b3c Removed global in favour of updating a dictionary 2015-11-30 20:29:53 +01:00
Daniel Hobley
2690e3c8f3 Replaced double quotes with single 2015-11-30 20:19:13 +01:00
Andreas Lutro
9193676f9c fix ssh_auth_test 
there were 4 side_effect return values, when it should only return 2
times - 2 of the 4 states.ssh_auth.absent calls are done with test=True
test=True and should therefore not call modules.ssh.rm_auth_key
 2015-11-30 20:13:52 +01:00
Jorge Schrauwen
cbded94f1a fix unit test (attempt 1) 2015-11-30 16:21:49 +00:00
Tim Harper
e060986828 add support to s3 for aws role assumption 2015-11-28 00:57:45 -07:00
Daniel Hobley
f482643959 Added beacon for detecting low battery on android devices 2015-11-27 14:03:05 +01:00
Bastiaan Bakker
5226cd8f79 remove trailing whitespace 
fix subdict_match test cases
 2015-11-25 20:41:13 -07:00
Bastiaan Bakker
44713cdb95 fix issue 29191: only try partial matches when a wildcard has been specified 2015-11-25 20:41:13 -07:00
Mike Place
7bd15621c8 Merge pull request #29192 from bastiaanb/fix/issue-29191-subdict_match-regression 
fix issue 29191: only try partial matches when a wildcard has been sp…
 2015-11-25 13:06:39 -07:00
Mike Place
89aee406fa Merge pull request #29153 from DSRCompany/features/3077_acl_limit_args 
ACL limit args
 2015-11-25 10:29:35 -07:00
Bastiaan Bakker
7052479ad3 remove trailing whitespace 
fix subdict_match test cases
 2015-11-25 17:12:17 +01:00
Bastiaan Bakker
e3af8d2151 fix issue 29191: only try partial matches when a wildcard has been specified 2015-11-25 16:03:33 +01:00
Dmitry Kuzmenko
002b1ef9bd Fixed use of assert_has_calls in tests. 
The method logic was changed in mock-1.1.0.
This mades the use of the method compatible with both <1.1.0 and >=1.1.0
 2015-11-25 15:31:20 +03:00
Dmitry Kuzmenko
09c4f69402 ACL test fix. 2015-11-25 12:33:46 +03:00
Stephen Woodrow
c695a57ba9 Fix tests. 2015-11-24 18:09:12 -08:00
Colton Myers
28b40de8da Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 
Conflicts:
    salt/client/ssh/__init__.py
    salt/client/ssh/ssh_py_shim.py
    salt/cloud/clouds/ec2.py
    salt/cloud/clouds/vmware.py
    salt/grains/philips_hue.py
    salt/modules/boto_ec2.py
    salt/modules/boto_route53.py
    salt/modules/dracr.py
    salt/modules/philips_hue.py
    salt/proxy/philips_hue.py
    salt/states/virtualenv_mod.py
 2015-11-24 16:07:31 -07:00
Mike Place
81bf332be4 Migrate pydsl tests to integration test suite 
This marks the beginning of a migration of the pydsl renderer tests
to the integration test suite and away from the unit test suite.

The unit test approach is becoming too difficult to maintain due to its complex approach to trying to internally manage a highstate run instead of calling into the salt state system to fully manage it.
 2015-11-24 15:46:14 -07:00
Dmitry Kuzmenko
f20d2aa43e ACL test update and fixes 2015-11-24 17:35:17 +03:00
Dmitry Kuzmenko
de5890a346 ACL function args: test and fixes 2015-11-24 17:35:17 +03:00
Dmitry Kuzmenko
3b9c4d2b35 Fixed LoadAuthTestCase 2015-11-24 17:35:16 +03:00
Nicolas Delaby
e98d18ba41 Expose docker networking as state 2015-11-24 13:55:22 +01:00
Nicolas Delaby
17ff5c1ab5 Add expose networking to modules.dockerng 2015-11-24 13:55:22 +01:00
Mike Place
30d0e7a0c2 Merge pull request #29008 from k00mi/develop 
Make systemd service state less slow
 2015-11-19 14:54:48 -07:00
Justin Findlay
9a4959a42b systemd module: new unit test for available 2015-11-19 13:29:08 -07:00
Mike Place
b692ab1cfb Merge pull request #29047 from schwing/fix-gpg-exception 
Fix salt.modules.gpg.import_key exception: 'GPG_1_3_1 referenced before assignment'
 2015-11-19 12:07:36 -07:00
John Schwinghammer
813f6e6808 Fix 'GPG_1_3_1 referenced before assignment' 
- Fix gpg.import_key() exception:
    "local variable 'GPG_1_3_1' referenced before assignment"
- Update the unit tests to test both the gpg.GPG_1_3_1=True and
gpg.GPG_1_3_1=False cases.
 2015-11-19 09:27:46 -06:00
Mike Place
83e50d2515 Merge pull request #28906 from TronPaul/configparser-serializer 
Configparser serializer
 2015-11-18 19:42:52 -07:00
Justin Findlay
0c0bce3ea6 cache runner test: add new unit tests 2015-11-18 16:33:46 -07:00
Mike Place
b386bfa59d Merge pull request #28952 from rominf/hg_status_multiple_repos 
[modules/hg] hg.status: multiple repositories
 2015-11-18 11:35:29 -07:00
Colton Myers
d76d62877d Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 
Conflicts:
    salt/modules/git.py
    salt/renderers/gpg.py
    salt/utils/__init__.py
 2015-11-17 16:24:43 -07:00
Mark McGuire
f0a60b33e2 Use changes in #28926 2015-11-17 10:54:19 -06:00
Mark McGuire
be2751885d Merge remote-tracking branch 'origin/develop' into configparser-serializer 2015-11-17 10:26:09 -06:00
Roman Inflianskas
ded2d46663 [modules/hg] hg.status: multiple repositories 2015-11-17 19:05:57 +03:00
Mike Place
1e9214f4e4 Merge pull request #28787 from chrigl/fix-28784 
closes #28784
 2015-11-17 08:54:04 -07:00
Mike Place
5b680c938a Merge pull request #28950 from DSRCompany/pr/28812_which 
PR 28812 which test fix
 2015-11-17 08:32:16 -07:00
Dmitry Kuzmenko
18571000c5 Fix which test in PR#28812 2015-11-17 11:29:41 +03:00
Christoph Glaubitz
8639e3e9c3 closes #28784 
In fact this test will fail on the current code, but that is like
intended. This tests the fix of #28783, which was introduced in 2015.5.
 2015-11-16 20:30:37 +01:00
Mike Place
27b917b623 Adjust tests for new loader spec 2015-11-16 12:23:05 -07:00
Justin Findlay
5ce61abf57 rewrite GPG unit tests 2015-11-16 09:36:29 -07:00
Mark McGuire
4324189658 add deserializer test, fix deserialization 2015-11-15 14:14:42 -06:00
Mark McGuire
53dd9ae138 Add configparser serializer 
* move "python" serializer to serializers
* make salt.states.file.serializer load serializers from salt.serializers
 2015-11-15 14:04:27 -06:00
Justin Findlay
e32a9aab85 rh_service._chkconfig_is_enabled unit tests 2015-11-13 23:38:40 -07:00
Colton Myers
efb479a1bd Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 
Conflicts:
    doc/topics/cloud/vmware.rst
    salt/cloud/clouds/vmware.py
    salt/grains/chronos.py
    salt/grains/marathon.py
    salt/loader.py
    salt/modules/chronos.py
    salt/modules/marathon.py
    salt/proxy/chronos.py
    salt/proxy/marathon.py
    salt/state.py
    salt/states/chronos_job.py
    salt/states/marathon_app.py
    salt/states/user.py
    salt/utils/schedule.py
 2015-11-13 15:18:45 -07:00
Todd Tomkinson
ba94878f45 marathon and chronos proxy minions 2015-11-12 10:03:38 -07:00
C. R. Oldham
2ad01fe7a2 Merge pull request #28778 from toddtomkinson/marathon_chronos_proxy_minions 
marathon and chronos proxy minions
 2015-11-12 08:07:21 -07:00
twangboy
c0cf33332c Fixed some Lint... 2015-11-11 14:27:06 -07:00
Justin Findlay
bc7e0cfe64 add file.symlink unit tests 2015-11-11 13:37:47 -07:00
Justin Findlay
9381dc7215 orthogonalize file.symlink unit tests 2015-11-11 13:37:18 -07:00
rallytime
e2b0fee57e Don't change perms list, only existing perms should be a dictionary. 
Refs #28269
 2015-11-11 12:31:51 -07:00
rallytime
7601647d69 Revert "rabbitmq.list_user_permissions returns a dict, not a list. Don't expect a list." 
This reverts commit 07482211eb.
 2015-11-11 12:23:17 -07:00
Todd Tomkinson
f6ccc0e250 marathon and chronos proxy minions 2015-11-11 10:51:28 -07:00
rallytime
07482211eb rabbitmq.list_user_permissions returns a dict, not a list. Don't expect a list. 
Refs #28269
 2015-11-11 09:45:35 -07:00
Scott Walton
e9b84b35b4 Resolved merge conflict with upstream. 2015-11-11 16:38:31 +00:00
Scott Walton
e46d31d446 Amended the tests to remove the tab-check and still keep #28608 fixed 2015-11-11 16:32:56 +00:00
Colton Myers
87365212b4 Merge pull request #28723 from basepi/merge-forward-develop 
Merge forward from 2015.8 to develop
 2015-11-10 11:26:29 -07:00
Mike Place
590f503fb8 Merge pull request #28748 from tinyclues/cors_url_with_arguments 
[Saltnado] - Add support for CORS preflight request for parametrized urls
 2015-11-10 11:24:30 -07:00
FELD Boris
049815fb34 Add support for cors preflight request for parametrized urls 
The implementation was broken for jobs and minions handlers
 2015-11-10 18:37:03 +01:00
Colton Myers
8a23181dd7 Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 
Conflicts:
    salt/modules/boto_secgroup.py
    salt/modules/rabbitmq.py
    salt/modules/win_system.py
    salt/modules/yumpkg.py
    salt/states/mount.py
 2015-11-09 17:05:43 -07:00
Colton Myers
c90431eddc Rip out unit test that doesn't apply anymore 
We now use -q with the command so we don't have to test our ability to
strip "Listing vhosts" out of the test
 2015-11-09 15:22:01 -07:00
Mike Place
759242a6ec Merge pull request #28671 from jfindlay/multi_mod 
implement multiple modules in the kmod state
 2015-11-07 19:11:52 -07:00
Justin Findlay
8524281f4e update kmod exec and state module unit tests 2015-11-07 16:04:23 -07:00
Steve Hajducko
455f40b0d2 Refactor etcd modules 
The etcd modules were using bits and pieces of python-etcd directly and
were using outdated exceptions to catch errors.  These errors were
causing issues when trying to use etcd modules for logic.

A summary of changes
    - Most of the 'work' is now done in etcd_util
    - Removed import of python-etcd from states/etcd_mod and the
      returner
    - Added new tests for etcd_util
    - Put in proper exceptions and catches for python-etcd
    - Added support for ValueError catching.  python-etcd doesn't
      support python 2.6 and raises ValueError when trying to format
      exceptions
    - Added watch function to etcd execution module
    - Added autospec to unit tests so hopefully less brittle
    - Added TTL and directory features to the set function

*BACKWARDS INCOMPATIBLE CHANGES*

All interfaces are still backwards incompatible.  However, the returns
from several of the etcd util functions have been changed.  The old
returns presented issues with certain test cases.  For instance, a
failed 'get' returned '', but a key with no value will also return ''.

The same issues occured with the 'ls', 'tree' and 'set' functions.  Trying to
ls a blank directory returned the same result as a failed ls of a
non-existent key.
 2015-11-06 16:29:50 -08:00
Scott Walton
540305dc99 Added test and fix for #28608. 2015-11-06 09:06:07 +00:00
Mike Place
81396927f8 Merge pull request #28605 from zigarn/a2xxconf 
Improvements on Debian-style apache utilities a2(en|dis)(mode|site|conf)
 2015-11-05 15:18:28 -07:00
Nicole Thomas
b5a89927f0 Merge pull request #28594 from rallytime/merge-develop 
Merge branch '2015.8' into develop
 2015-11-05 14:47:42 -07:00
Alexandre Garnier
f505b51ab1 Add module and state wrappers on a2enconf/a2disconf 2015-11-05 19:07:14 +01:00
rallytime
62d688d720 Fix mock patch module name 2015-11-05 10:45:30 -07:00
rallytime
3bcd068f6a Update cloud vmware unittests to utilize the salt.utils.vmware.py file 2015-11-05 10:02:05 -07:00
Alexandre Garnier
2e6cf66d80 Add apache_site state (like apache_module) 
Allow to enable/disable Debian-style sites with `a2ensite`/`a2dissite`.
 2015-11-05 17:52:42 +01:00
Alexandre Garnier
39e1e6448b Simplify deb_apache.check_mod_enabled 
There is no 'default' with '000-' prefix for modules.
(Looks like a copy/paste from `check_site_enabled`)
 2015-11-05 17:52:42 +01:00
Mike Place
5293150d25 Fix tests 2015-11-05 08:29:55 -07:00
Jiri Kotlin
eb19140cc5 INI test compliancy - modified ini_manage_test.py 2015-11-05 13:49:05 +00:00
rallytime
d31b0d1573 Merge branch '2015.8' into develop 2015-11-04 15:40:03 -07:00
Mike Place
7ca7ed4b37 Merge pull request #28579 from jfindlay/virt_ret 
fix __virtual__ returns: tls,uptime mods
 2015-11-04 15:00:02 -07:00
Justin Findlay
333c132378 fix __virtual__ returns: tls,uptime mods 2015-11-04 13:10:38 -07:00
Mike Place
ec924e8410 Merge pull request #28560 from bdrung/2015.8 
Fix various typos
 2015-11-04 08:06:36 -07:00
Benjamin Drung
470e82f17f Fix typo an dictionnary -> dictionary 2015-11-04 11:06:09 +01:00
Justin Findlay
11a9a5868f simplify timezone module unit test mocks 2015-11-03 19:37:54 -07:00
Justin Findlay
476b651c94 update timezone module unit tests for timedatectl 2015-11-03 19:34:01 -07:00
Colton Myers
422c641233 Remove test failing because of mocks -- it's deprecated anyway 2015-11-02 19:42:01 -07:00
Colton Myers
32969b2408 Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 
Conflicts:
    doc/topics/cloud/digitalocean.rst
    salt/cloud/clouds/digital_ocean.py
    salt/cloud/clouds/linode.py
    salt/loader.py
    salt/modules/blockdev.py
    salt/modules/boto_route53.py
    salt/modules/boto_vpc.py
    salt/modules/bsd_shadow.py
    salt/modules/file.py
    salt/modules/rabbitmq.py
    salt/modules/schedule.py
    salt/modules/win_network.py
    salt/runners/state.py
    salt/spm/__init__.py
    tests/unit/modules/blockdev_test.py
 2015-11-02 18:19:01 -07:00
twangboy
7d39091c91 Fixed some more lint 2015-11-02 16:51:16 -07:00
twangboy
3dbd62af2c Fixed some tests... hopefully 2015-11-02 16:13:07 -07:00
Colton Myers
238411c8ce Merge pull request #28464 from basepi/merge-forward-2015.8 
[2015.8] Merge forward from 2015.5 to 2015.8
 2015-11-02 13:18:21 -07:00
Colton Myers
6f6e687cb4 Mock master_uri for even tests 2015-11-02 12:15:53 -07:00
Mike Place
da62fdc1e7 Merge pull request #28498 from rominf/postgres-quotes 
[modules/postgres] quote identifiers in SQL
 2015-11-02 12:11:57 -07:00
Roman Inflianskas
0184ecaba7 [modules/postgres] fix tests 2015-11-02 20:53:18 +03:00
Mike Place
7c81188f67 Merge pull request #28421 from rominf/service_run 
[modules/service] Add run function to run services with custom arguments
 2015-11-02 10:43:54 -07:00
Christophe Drevet-Droguet
eee2318873 grains state: allow deleting grain with 'False' value 
and destroy a grain previously set to None, with destructive=True:

The f46722aaeb commit, from Bruno Binet <bruno.binet@gmail.com> was
effectively reverted during my work on nested and complex values support.

This commit get it back, plus the ability to destroy a existing grain that
was previously set to None, plus tests for these.
 2015-11-02 09:31:44 -05:00
Christophe Drevet-Droguet
576252da05 grains state: list_present, list_absent support nested grain 
... and custom delimiter
 2015-11-02 09:31:44 -05:00
Christophe Drevet-Droguet
62a1f37d86 grains state: nested support for grains.append 2015-11-02 09:31:44 -05:00
Christophe Drevet-Droguet
c19cff517a grains state: more tests 2015-11-02 09:31:44 -05:00
Christophe Drevet-Droguet
cc844e4a2c grains state tests: test the grain file content as well 
It may be overkill, but I'm nervous about this change and
I don't want to mess with the grain file of a lot of people
 2015-11-02 09:31:44 -05:00
Christophe Drevet-Droguet
1c5cd4c82d grains state: changes comment more accurate 2015-11-02 09:31:44 -05:00
Christophe Drevet-Droguet
c63913e602 grains module: simpler comment for already set key 2015-11-02 09:31:44 -05:00
Christophe Drevet-Droguet
6b8c245b87 grains state: new tests for nested grains 2015-11-02 09:31:43 -05:00
Andreas Lutro
a772ce330a fix tests 2015-11-02 10:50:51 +01:00
Daniel Hobley
e0060ac5e9 Replaced user with runas for cmd.run 2015-11-01 09:35:58 +01:00
Daniel Hobley
b6e27932c8 Added the ability to run adb as a specific user 2015-10-31 23:09:08 +01:00
Daniel Hobley
3d1552e9b9 Fixed a bug in adb beacon when the deamon starts up 2015-10-31 21:56:59 +01:00
Daniel Hobley
3fe0a7764b Added beacon for adb devices 
With this beacon you are able to get events when a device goes offline or goes missing from the minion
 2015-10-31 21:06:58 +01:00
Roman Inflianskas
5d0ef71b3d [tests/unit][modules/service] add service.run, fix service.* 2015-10-31 14:42:05 +03:00
Roman Inflianskas
6190d6699e [modules/service] add service.run 2015-10-31 14:41:58 +03:00
Roman Inflianskas
233b9163a5 [tests/unit][modules/hg] add hg.status 2015-10-31 14:30:08 +03:00
justinta89
7ca79f1f7b Skipped wipefs test if wipefs does not exist on OS 2015-10-30 15:04:33 -06:00
Justin Findlay
9ec72ca724 fix file state unit tests for win symlink feature 2015-10-29 13:50:38 -06:00
Mike Place
558be2e033 Merge pull request #28352 from rominf/check_or_die_to_virtual 
Replace all check_or_die to __virtual__
 2015-10-29 13:41:33 -06:00
Daniel Hobley
124c758587 Lint fixes 2015-10-29 15:53:31 +01:00
Daniel Hobley
8af9246c4c Hostname is the same even if the characters are in different cases 
- Windows likes to give you back a hostname in uppercase while you might want to specify it in lower case, this commit allows you to do that
 2015-10-29 13:36:18 +01:00
Daniel Hobley
72db9026e1 Lint fixes 2015-10-29 12:02:14 +01:00
Daniel Hobley
a78aab3255 Added the ability to change the "hostname" on windows minions 2015-10-29 11:39:22 +01:00
Roman Inflianskas
e299fc3ff2 Replace check_or_die functions to __virtual__ 2015-10-29 10:59:58 +03:00
Matthias Erll
042314246f Unit test for merging included pillars. 2015-10-28 21:45:26 +01:00
Matthias Erll
2f3f2d6f29 Consider each pillar match only once. 2015-10-28 13:56:44 +01:00
Erik Johnson
a44c8d8dab Merge pull request #28270 from rallytime/refactor_rabbitmq_plugin_state 
Refactor RabbitMQ Plugin State to correctly use test=true and format errors
 2015-10-27 11:18:34 -06:00
Erik Johnson
4efd07eba5 Merge pull request #28269 from rallytime/refactor_rabbitmq_user_state 
Refactor rabbitmq_user state to use test=True correctly
 2015-10-27 11:17:42 -06:00
rallytime
9e40c3a6a6 Fine tuning and fix tests 2015-10-27 10:30:00 -04:00
rallytime
65fdb50246 Get the list indice to compart before looking at keys 2015-10-26 14:20:27 -04:00
rallytime
aebbcb88ea Pylint fix 2015-10-26 14:10:34 -04:00
rallytime
19b8b868a3 Clean-up/fixes to rabbitmq_user state and test adjustments 2015-10-26 13:48:50 -04:00
Mike Place
5b7cc65b03 Merge pull request #27843 from jacksontj/concurrent 
RequestContext
 2015-10-26 09:00:54 -06:00
rallytime
95defb87c5 Add test for availability_zone check to boto_vpc_tests 2015-10-26 10:15:29 -04:00
Mike Place
abe3003aed Merge pull request #28204 from DSRCompany/issues/23157_rename_client_acl 
Deprecate client_acl with publisher_acl (rename)
 2015-10-26 08:04:56 -06:00
Justin Findlay
0dc72135de update blockdev exec and state module unit tests 2015-10-23 18:12:43 -06:00
Thomas Jackson
ff1ac70cd5 Python3 compat for context_test 2015-10-23 11:30:21 -07:00
Thomas Jackson
718cf64817 Pylint cleanup 2015-10-23 08:53:44 -07:00
justinta89
835a11b6be Fixed win_firewall_test 2015-10-23 09:53:03 -06:00
Thomas Jackson
256a0e2af8 Rename and consolidate NUM_JOBs into a single class-wide variable 2015-10-23 08:43:46 -07:00
Thomas Jackson
3662465471 pylint cleanup 2015-10-23 08:40:56 -07:00
Thomas Jackson
408af9d419 Add Coroutine tests for the ContextDict 2015-10-23 08:31:37 -07:00
Dmitry Kuzmenko
022c8bdf7e Fixed unit test 2015-10-23 17:26:15 +03:00
Dmitry Kuzmenko
7a5204ef02 Deprecate client_acl with publisher_acl (rename) 
Keeping client_acl support
 2015-10-23 11:59:40 +03:00
Thomas Jackson
6838a9534f Initial addition of ContextDict 
Inspired by #23373

The basic issue we ran into is that the loader is injecting globals directly into the global namespace. This means that these injected values are not thread or coroutine safe-- meaning we can never do more than one thing at a time. Instead of multiprocessing everything to death-- we can simply use a stack_context to nicely handle this down in the core. As far as the module authors/users are concerned nothing has changed-- but the storage behind the scenes is now per-JID. This same set of classes can easily be used to store additional data (next candidates are reactors, master MWorker tasks, etc.).
 2015-10-22 18:41:27 -07:00
justinta89
a74dbad74a Started fixing win_firewall_test 2015-10-22 13:12:31 -06:00
twangboy
69c32a663e Fixed some lint 2015-10-22 11:24:38 -06:00
twangboy
638dec5027 Fixed some tests... let's see if they're really are 2015-10-22 11:05:22 -06:00
Colton Myers
c89d63650e Quiet pylint 2015-10-21 15:10:52 -06:00
Ronald van Zantvoort
46bf6d4fa3 Update file.serialize test for Python serialized 
pprint.pformat seems non-reversible, so just add the newline there as well
 2015-10-21 17:12:53 +02:00
Colton Myers
a471832fa7 Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 
Conflicts:
    salt/cloud/clouds/ec2.py
    salt/config/__init__.py
    salt/modules/git.py
    salt/modules/hosts.py
    salt/modules/htpasswd.py
    salt/states/boto_secgroup.py
    salt/states/htpasswd.py
    tests/unit/modules/schedule_test.py
 2015-10-20 18:13:11 -06:00
Marek Skrobacki
f735792846 s6 service module 2015-10-20 11:43:09 +01:00
Mike Place
1db6406bef Merge pull request #28013 from rallytime/bp-27891 
Back-port #27891 to 2015.8
 2015-10-19 06:57:51 -06:00
rallytime
9ea33bf0e4 Pylint fixes 2015-10-16 07:22:46 -06:00
Domingo Kiser
4af5b5c33f introduce recurse_list pillar_source_merging_strategy 2015-10-16 05:24:40 -06:00
justinta89
cd67843bd0 Fix schedule_test failure 2015-10-15 14:49:26 -06:00
Colton Myers
153087a7b4 Merge pull request #26945 from dr4Ke/feature_state_grains_support_nested_and_dict 
Feature state grains support nested and dict
 2015-10-15 14:25:44 -06:00
Erik Johnson
2d0b16559e Merge pull request #27676 from ticosax/no-more-arg-to-docker-start 
[dockerng] WIP No more runtime args passed to docker.start()
 2015-10-14 08:38:41 -05:00
Colton Myers
6537da77fe Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 
Conflicts:
    salt/grains/core.py
    salt/loader.py
    salt/minion.py
    salt/modules/dockerng.py
    salt/modules/rest_package.py
    salt/modules/ssh.py
    salt/modules/state.py
    salt/modules/timezone.py
    salt/modules/zypper.py
    salt/runners/state.py
    salt/state.py
    salt/states/virtualenv_mod.py
    salt/utils/cloud.py
 2015-10-13 17:27:48 -06:00
Colton Myers
722327ee5f Merge pull request #27885 from basepi/merge-forward-2015.8 
[2015.8] Merge forward from 2015.5 to 2015.8
 2015-10-13 16:44:20 -06:00
Colton Myers
5ecd5615f2 Remove failing heavily-mocked test 2015-10-13 15:08:40 -06:00
Nicolas Delaby
a1d0ba392f fixup! Do not pass any argument to docker.start 2015-10-13 20:53:11 +02:00
Nicolas Delaby
65c8762e1f Do not pass any argument to docker.start 
docker.create is responsible to manage all of them, since docker API 1.16
 2015-10-13 19:39:32 +02:00
Mike Place
59e93ddde6 Merge pull request #27521 from terminalmage/zh107 
Remove raw string formatting in execution modules
 2015-10-13 10:57:08 -06:00
Mike Place
36f05fb526 Merge pull request #27882 from twangboy/win_task_module 
Created win_task.py module
 2015-10-13 10:54:13 -06:00
Erik Johnson
50cb56d7f6 Update raet_publish unit tests to reflect changes in execution module 2015-10-13 10:52:59 -05:00
Erik Johnson
7de02e95e9 Update darwin_pkgutil unit tests to reflect changes in execution module 2015-10-13 10:52:59 -05:00
Erik Johnson
ca9c478fa7 Update gem unit tests to reflect changes in execution module 2015-10-13 10:52:59 -05:00
Erik Johnson
71d57248d7 Update postgres unit tests to reflect changes in execution module 2015-10-13 10:52:59 -05:00
Erik Johnson
aef6c39c04 Update rvm unit tests to reflect changes in execution module 2015-10-13 10:52:59 -05:00
Erik Johnson
0210ef4434 Update mac_user unit tests to reflect changes in execution module 2015-10-13 10:52:59 -05:00
Erik Johnson
76ce6949d7 Update at unit tests to reflect changes in execution module 2015-10-13 10:52:59 -05:00
Erik Johnson
d2ad1d7892 Update rsync unit tests to reflect changes in execution module 2015-10-13 10:52:59 -05:00
Erik Johnson
362a91d42b Remove rsync.config test since mock_open can't handle iterative reads 2015-10-13 10:52:59 -05:00
Erik Johnson
b1c60121bd Update virtualenv unit tests to reflect changes in execution module 2015-10-13 10:52:58 -05:00
Erik Johnson
a5d6a3e768 Update pw_user unit tests to reflect changes in execution module 2015-10-13 10:52:58 -05:00
Erik Johnson
93815e6e39 remove rbenv test that doesn't really test anything 2015-10-13 10:52:58 -05:00
Mike Place
6d46a38d5d Whitespace lint 
Refs #27891
 2015-10-13 09:15:12 -06:00
Mike Place
a158cd50e6 Merge pull request #27746 from alprs/fix-timedatectl_failure 
timezone module: handle timedatectl errors
 2015-10-13 08:55:27 -06:00
Mike Place
9dc19caa79 Merge pull request #27816 from alprs/fix-reboot_delay 
Make system.reboot use `shutdown -r` when available
 2015-10-13 08:52:06 -06:00
Domingo Kiser
a8adaa8f9e introduce recurse_list pillar_source_merging_strategy 2015-10-12 21:59:39 -07:00
twangboy
14e060ed9c Fixed some tests 2015-10-12 16:54:10 -06:00
Andreas Lutro
04ef51e524 make system.reboot use shutdown -r when available 
see issue #27710
 2015-10-12 21:54:42 +02:00
Justin Findlay
bc0f167850 update timezone mod unit tests for errors 2015-10-12 11:39:03 -06:00
C. R. Oldham
b049377cbe Remove rest_sample_test, it wasn't testing anything 2015-10-12 08:34:36 -06:00
Richard Hansen
9aa19575fa new ldap state module 2015-10-09 17:47:56 -04:00
Eren Güven
2caf1d21d6 fix test 2015-10-08 14:57:33 +02:00
Colton Myers
69d960f8e6 Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 
Conflicts:
    doc/man/salt.7
    doc/topics/ssh/index.rst
    salt/modules/boto_secgroup.py
    salt/modules/dockerng.py
    salt/states/archive.py
    salt/states/boto_elb.py
    salt/states/boto_secgroup.py
    tests/unit/modules/schedule_test.py
 2015-10-07 13:11:48 -06:00
Nicolas Delaby
821ed72f37 pass filters argument to dockerng.ps 2015-10-07 15:06:16 +02:00
Nicole Thomas
1b9e814c13 Merge pull request #27718 from rallytime/merge-27635-and-27552 
Merge #27635 and #27552
 2015-10-06 12:40:24 -06:00
Nicolas Delaby
edf625c8b4 Add support of labels parameter for dockerng 2015-10-06 13:18:05 +02:00
Stephen Woodrow
509ded1bd0 Fix some tests. 2015-10-05 20:57:17 -07:00
Colton Myers
77516912fa Merge pull request #27630 from ticosax/include-container-id-docker-mine 
Expose container_id in mine.get_docker
 2015-10-05 15:56:53 -06:00
Colton Myers
7a4291008e Merge pull request #27689 from rallytime/fix-tests-27448 
Merge #27448 with test fixes
 2015-10-05 15:17:41 -06:00
rallytime
05a506ec9f Use correct comment in test 2015-10-05 14:02:13 -06:00
rallytime
8296fefb31 Merge #27448 with test fixes 2015-10-05 12:33:03 -06:00
Ethan Moore
c7aea90546 Adding tags to OrderedDict in test module 
Adding SaltInvocationError import
 2015-10-02 20:10:07 +00:00
Nicolas Delaby
9e56a7e9db Expose container_id in mine.get_docker 
Because sometimes we should be able to perform additional introspection.
 2015-10-02 21:30:33 +02:00
Nicole Thomas
e103f53b4f Merge pull request #27485 from lyft/boto-asg-scheduled-actions 
Add scheduled actions (like scaleup/scaledown actions) to boto_asg
 2015-10-01 09:18:19 -06:00
Ryan Lane
714a93900b Patch config.option 2015-09-30 10:04:10 -07:00
Mike Place
fd11e0cd95 Merge pull request #27522 from twangboy/fix_26629 
Removed dependency on powershell to restart salt-minion
 2015-09-30 10:19:29 -06:00
C. R. Oldham
eb76531e96 Merge pull request #27550 from rallytime/cloud-logging 
[2015.8] Clean up salt-cloud logging and make it more useful
 2015-09-30 09:48:53 -06:00
Nicole Thomas
e5de9409c2 Merge pull request #27525 from basepi/merge-forward-2015.8 
[2015.8] Merge forward from 2015.5 to 2015.8
 2015-09-29 21:38:22 -06:00
rallytime
78c85fbb31 Add unit tests for new recursive function 2015-09-29 21:25:47 -06:00
Colton Myers
1f3eb1c526 Remove useless mocked unit test 2015-09-29 18:23:46 -06:00
Colton Myers
41cad702e3 Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 
Conflicts:
    salt/minion.py
    salt/modules/rest_service.py
    salt/states/dockerng.py
    salt/utils/cloud.py
 2015-09-29 18:13:33 -06:00
twangboy
163c54505d Fixed tests... hopefully 2015-09-29 15:28:23 -06:00
Colton Myers
73b90f155e Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 
Conflicts:
    doc/topics/cloud/gce.rst
    doc/topics/windows/windows-package-manager.rst
    salt/client/ssh/state.py
    salt/cloud/clouds/ec2.py
    salt/modules/defaults.py
    salt/modules/file.py
    salt/utils/cloud.py
 2015-09-29 14:56:41 -06:00
Nicole Thomas
e974a3c8aa Merge pull request #27510 from rallytime/ryan-lane-test-fix 
Merge #27475 with test fixes
 2015-09-29 12:34:32 -06:00
rallytime
cae2c4e715 Syntax fix 2015-09-29 10:02:16 -06:00
rallytime
458547ba03 Fix test failures for boto __state__ changes 2015-09-29 09:55:44 -06:00
Mike Place
d85b0cbd69 Merge pull request #27451 from ticosax/dockerng-host-config-support 
[dockerng] Enforce usage of host_config and require docker-py>=1.4.0
 2015-09-29 09:51:28 -06:00
Nicolas Delaby
fadd9bd43e Add test to check we don't call inspect_image on absent images. 2015-09-29 15:53:29 +02:00
Nicolas Delaby
b184faa55b Enforce usage of host_config and require docker-py>=1.4.0 2015-09-28 23:24:57 +02:00
Mike Place
0bc37c0d41 Fix test 2015-09-28 12:57:22 -06:00
Nicolas Delaby
a1ed6cda56 Skip test if docker-py is not installed 2015-09-28 19:53:10 +02:00
Mike Place
74095b6b22 Lint 2015-09-28 11:48:51 -06:00
Nicolas Delaby
cc8471bd1b dockerpy expect only command argument not cmd 2015-09-28 10:08:40 -05:00
justinta89
fd0dedeb99 Skipping Async tests 
Skipping the transport async tests until we can devote more time to fixing the
test failures associated with them.
 2015-09-24 13:41:58 -06:00
Daniel Hobley
f972c39333 Lint fixes 2015-09-24 12:41:56 +02:00
Daniel Hobley
40db871e2b Added the ability to trim the returned files from an unzip 
- This reduces log spamming when you unzip thousands of files, it defaults to off
 2015-09-24 11:43:21 +02:00
Mike Place
23fcc9e348 Merge pull request #27248 from tinyclues/better_cors_headers 
[Saltnado] - The CORS implementation was a bit naive about headers allowance.
 2015-09-23 08:50:06 -06:00
Mike Place
3933eed307 Merge pull request #27249 from tinyclues/login_support_more_content_type 
[Saltnado] - Add the support of login payload in JSON and YAML.
 2015-09-23 08:49:42 -06:00
Mike Place
f63f4d8c43 Merge pull request #27289 from terminalmage/encrypted-cli-pillar 
Feature add: Encrypted CLI pillar data
 2015-09-22 10:34:13 -06:00
Erik Johnson
bacc76c355 Update mocked objects for state module tests 
Added the new pillar_enc value
 2015-09-22 08:25:51 -05:00
FELD Boris
6417161fd7 The CORS implementation was a bit naive about headers allowance. 
A preflight request send the list of headers of the final request
in a special header ```Access-Control-Request-Headers```.
The server must returns the list of allowed header in the special header
```Access-Control-Allow-Headers```.

This PR just returns the whole list of headers but may allow filtering of some
of them quite easily. I'm not sure to see how filtering how headers may
impact security, if anyone has some leads.
 2015-09-18 23:24:43 +02:00
FELD Boris
a4fd1e75c5 Add the support of login payload in JSON and YAML. 
Login endpoint supported only application/x-www-form-urlencoded which may
be an useless limitation. This PR add support for more content-type,
JSON and YAML and every content-type supported by saltnado in general
as it uses the same deserialisation method than the lowstate deserialisation.
 2015-09-18 19:16:47 +02:00
Colton Myers
9864d9e0fa Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 
Conflicts:
    doc/ref/modules/all/index.rst
    doc/topics/releases/boron.rst
    salt/cli/daemons.py
    salt/cli/salt.py
    salt/modules/jboss7.py
    salt/states/file.py
 2015-09-18 11:03:37 -06:00
Colton Myers
9ddc88c6ba Merge pull request #27198 from basepi/merge-forward-develop 
Merge forward from 2015.8 to develop
 2015-09-17 15:33:15 -06:00
Colton Myers
1cbfa06591 Remove heavily-mocked failing test 2015-09-17 14:38:05 -06:00
Colton Myers
26b6c92975 Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 
Conflicts:
    doc/conf.py
    salt/config/__init__.py
    salt/modules/rh_ip.py
    salt/pillar/s3.py
    salt/returners/local_cache.py
    salt/states/user.py
    salt/templates/rh_ip/rh7_eth.jinja
 2015-09-17 11:10:37 -06:00
Colton Myers
2c2a5f85ac Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 
Conflicts:
    doc/conf.py
    doc/topics/cloud/gce.rst
    salt/cli/api.py
    salt/cli/call.py
    salt/cli/cp.py
    salt/cli/key.py
    salt/cli/run.py
    salt/cli/salt.py
    salt/modules/dockerio.py
    salt/states/dockerio.py
 2015-09-17 10:54:33 -06:00
FELD Boris
5e9c3c7d96 Improve support of Accept header in saltnado. 
It currently supports 'simple' values like application/json, but Accept header
could also include more than one value with parameters
See http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.1.
For example:

```application/json, text/javascript, */*; q=0.01```

This PR add support for multiple media_range in Accept header, support parsing
of parameter (like q=0.01) but discard them and finally iterate on
media_range and take the first compatible.

A more complete implementation may fully supports the RFC and support
q parameter and specific order of priority to find the most compatible
Content-Type but I don't think it's worth the pain.

If we want a better implementation, werkzeug has actually an implementation
http://werkzeug.pocoo.org/docs/0.10/datastructures/#werkzeug.datastructures.Accept.best_match.
 2015-09-17 00:48:34 +02:00
twangboy
7992b7e20a Fixed some tests... hopefully... 2015-09-15 16:27:47 -06:00
FELD Boris
ef3b7ddc2d Fix lints 2015-09-15 20:29:18 +02:00
FELD Boris
b13f66ee4b Add support for CORS in saltnado. 
Add support for CORS and tests in RPC salt-api. The code was inspired by
https://github.com/globocom/tornado-cors.

Also add support for CORS in websocket. By adding some tests, I made
a small refactoring to make the websocket handler more easily testable.

Some documentation about CORS could be found here
https://developer.mozilla.org/en-US/docs/Web/HTTP/Access_control_CORS
for reference.
 2015-09-15 18:52:44 +02:00
Christophe Drevet-Droguet
8553c44cea grains state: allow deleting grain with 'False' value 
and destroy a grain previously set to None, with destructive=True:

The f46722aaeb commit, from Bruno Binet <bruno.binet@gmail.com> was
effectively reverted during my work on nested and complex values support.

This commit get it back, plus the ability to destroy a existing grain that
was previously set to None, plus tests for these.
 2015-09-15 17:49:49 +02:00
Christophe Drevet-Droguet
484853412b grains state: list_present, list_absent support nested grain 
... and custom delimiter
 2015-09-15 17:49:49 +02:00
Christophe Drevet-Droguet
a02f125faa grains state: nested support for grains.append 2015-09-15 17:49:49 +02:00
Christophe Drevet-Droguet
394586f759 grains state: more tests 2015-09-15 17:49:49 +02:00
Christophe Drevet-Droguet
098af32354 grains state tests: test the grain file content as well 
It may be overkill, but I'm nervous about this change and
I don't want to mess with the grain file of a lot of people
 2015-09-15 17:49:49 +02:00
Christophe Drevet-Droguet
250bc8d308 grains state: changes comment more accurate 2015-09-15 17:49:49 +02:00
Christophe Drevet-Droguet
557e642ddf grains module: simpler comment for already set key 2015-09-15 17:49:49 +02:00
Christophe Drevet-Droguet
b0c9d23cef grains state: new tests for nested grains 2015-09-15 17:49:49 +02:00
Justin Findlay
440855b182 Merge pull request #27033 from jfindlay/n0ne 
Merge #27019
 2015-09-15 01:32:17 -06:00
Colton Myers
ab519fb5ff Remove heavily-mocked unit tests 2015-09-14 17:00:02 -06:00
Justin Findlay
3334b9d548 fix comment and unit test for reg state 2015-09-14 16:04:09 -06:00
Colton Myers
274464a85b Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 
Conflicts:
    doc/topics/reactor/index.rst
    salt/cloud/clouds/digital_ocean_v2.py
    salt/modules/groupadd.py
    salt/modules/localemod.py
    salt/modules/mysql.py
    salt/modules/useradd.py
    salt/modules/win_pkg.py
    salt/modules/win_useradd.py
    salt/netapi/rest_cherrypy/app.py
    salt/pillar/s3.py
    salt/returners/local_cache.py
    salt/states/htpasswd.py
    salt/states/user.py
 2015-09-14 14:39:03 -06:00
Mike Place
a87a62c5b6 Merge pull request #26857 from bradthurber/add_jboss_domain_mode_to_jboss7_modules 
add jboss domain mode to jboss7 python modules
 2015-09-14 13:40:26 -06:00
Mike Place
b13b6b912a Merge pull request #26984 from tinyclues/26505_improve_content_type_support 
[NetAPI] SaltNado - Improve support for Content-Type parsing. Ref #26505
 2015-09-14 13:02:28 -06:00
Brad Thurber
5d4798012a more test updates 2015-09-14 13:05:07 -04:00
Pedro Algarvio
fcb7138efa Make sure spm tests are picked up by runtests. 
Lists in py2 don't have the clear method
 2015-09-14 17:54:51 +01:00
Brad Thurber
872aabf7fa update more tests 2015-09-14 11:55:42 -04:00
Brad Thurber
b1ceb221a0 more test updates. It wouldn't surprise me if these changes expose other failing tests. 2015-09-14 10:36:40 -04:00
Brad Thurber
72235f61ce clean up lint and add profile to tests 2015-09-14 09:03:30 -04:00
rallytime
a0de117a0f Merge branch '2015.8' into develop 
Conflicts:
    salt/cloud/__init__.py
    salt/cloud/clouds/proxmox.py
    salt/config/__init__.py
 2015-09-11 09:33:21 -06:00
Justin Findlay
391a09d5ac update reg state unit tests 2015-09-10 16:16:15 -06:00
Justin Findlay
b36a7107b2 update win_path exec module unit tests 2015-09-10 15:17:46 -06:00
Justin Findlay
801f2eadb5 Merge pull request #26874 from evverx/use-localectl-on-jessie-and-vivid 
Use localectl for locale setting/getting on Debian if available
 2015-09-10 13:30:05 -06:00
Erik Johnson
30a4915762 Update tests to reflect changes to timezone module 2015-09-10 11:05:38 -05:00
Seth House
6d22514934 Rename the rest_cherrypy tests to conform to our convention 
Previously they conformed to the default unittest2 convention.
 2015-09-09 10:39:34 -06:00
FELD Boris
23c7b4847c Improve support for Content-Type parsing. Ref #26505 
It currently supports 'simple' values like application/json, but Content-Type
header could also includes parameter. See RFC http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.17.

When sending JSON from a browser for example, the Content-Type is
`application/json; charset=utf-8` and salt-api failed to detect JSON content.

The proposition is to use cgi.parse_header method (https://docs.python.org/2.7/library/cgi.html?highlight=cgi#cgi.parse_header)
to correctly parse the Content-Type value but ignore parameters, JSON should
always be UTF-8 but I don't know about other supported Content-Type.
 2015-09-09 16:41:29 +02:00
Seth House
2aa3da8911 Rename the rest_cherrypy tests to conform to our convention 
Previously they conformed to the default unittest2 convention.
 2015-09-08 15:40:06 -06:00
Pedro Algarvio
10a9189d83 Merge remote-tracking branch 'upstream/2015.8' into hotfix/merge-forward-develop 2015-09-06 12:42:58 +01:00
Mike Place
a33569a8be Merge pull request #26910 from s0undt3ch/hotfix/26848-event-backwards-compat 
Sometimes the event system is just too fast
 2015-09-04 09:00:39 -06:00
Pedro Algarvio
503e050a75 Sometimes the event system is just too fast 2015-09-04 15:52:06 +01:00
Evgeny Vereshchagin
8f77b743cd Use localectl for locale setting on Debian if available 2015-09-04 04:06:55 +03:00
Mike Place
1d5fd71fa3 Merge pull request #26880 from s0undt3ch/hotfix/26848-event-backwards-compat 
Restore backwards compatibility to `salt.utils.event`
 2015-09-03 17:04:45 -06:00
Michael Steed
d6e64ec1a7 lint 2015-09-03 14:30:58 -06:00
Michael Steed
a42651fb38 spm updates 
- add hash_file() routine to salt.spm.pkgfiles.local
- use os.path.exists() instead of pkgfiles.path.exists() in
  _local_install()
 2015-09-03 14:28:21 -06:00
Colton Myers
307d3d05a4 Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 
Conflicts:
    doc/man/salt.7
    salt/modules/yumpkg.py
 2015-09-03 14:24:45 -06:00
Mike Place
57b78d369a Make the testing ioloop the current one 
Otherwise, loops from previous intefere and cause stacktraces on ioloop init
 2015-09-03 13:28:28 -06:00
Pedro Algarvio
2f40387290 Add test_event_single_wait_0_no_block_False test case 2015-09-03 19:54:57 +01:00
Pedro Algarvio
ae9c6c9cff Workaround wait=0 meaning a blocking call when non blocking is required 2015-09-03 18:06:43 +01:00
Pedro Algarvio
dc0fec3be3 Restore backwards compatibility to salt.utils.event 
Fixes #26848
Refs #26000
 2015-09-03 11:11:58 +01:00
Joe Julian
6108ec4280 Gated dbus for os families that use it 
Gated the dbus include for os families that are currently using it
within this module at this time.

Renamed some defs to more appropriately express their function.
 2015-09-01 15:19:49 -07:00