valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 01:18:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
66,017 Commits 24 Branches 182 Tags 341 MiB
cbb28492a3
Commit Graph

6476 Commits

Author SHA1 Message Date
twangboy
fef54563b0 More lint 2016-01-22 19:04:03 -07:00
twangboy
306d13a7fa Fixed tests 2016-01-22 17:36:48 -07:00
twangboy
1c58318013 Fixed tests 2016-01-22 17:32:42 -07:00
twangboy
88841e604f Fixed some tests 2016-01-22 17:27:18 -07:00
twangboy
6eb250a807 Fixed some tests 2016-01-22 17:20:25 -07:00
Mike Place
f27b602a0f Fix bad mock in win_service_test 2016-01-22 13:37:32 -07:00
Mike Place
44dea20bf3 Merge pull request #30550 from cachedout/fix_30113 
Fixup for Let test=True option work for http.query state #30113
 2016-01-22 11:35:31 -07:00
Mike Place
427f6f7cad Fix failing unit test 2016-01-22 10:54:25 -07:00
Andrew Colin Kissa
82a966b1f4 Add postgres_initdb state module tests 2016-01-22 12:16:51 +02:00
Andrew Colin Kissa
f5aa107583 Add tests for data directory init and existance check 2016-01-22 12:15:45 +02:00
Colton Myers
cb8bf91944 Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 
Conflicts:
    doc/ref/configuration/master.rst
    doc/topics/cloud/linode.rst
    salt/cloud/clouds/linode.py
    salt/modules/rh_ip.py
    salt/renderers/pyobjects.py
    salt/states/file.py
 2016-01-21 17:42:50 -07:00
Mike Place
cdc731b8c5 Merge pull request #30521 from basepi/merge-forward-2015.8 
[2015.8] Merge forward from 2015.5 to 2015.8
 2016-01-21 16:05:03 -07:00
Mike Place
40ba550ffd Merge pull request #30511 from kraney/boto_s3_bucket 
Boto s3 bucket state
 2016-01-21 15:52:58 -07:00
Ethan Devenport
44491f69cf Adds cloud provider support for ProfitBricks Cloud Computing Infrastructure Services. 2016-01-21 22:52:25 +00:00
Colton Myers
f22f5ff851 Fix lint 2016-01-21 15:33:15 -07:00
Erik Johnson
ea0ca70187 Add git.list_worktrees unit test 2016-01-21 15:42:30 -06:00
Colton Myers
117fb205de Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 
Conflicts:
    tests/unit/modules/boto_vpc_test.py
 2016-01-21 14:37:32 -07:00
Erik Johnson
393015edbb Remove git.list_worktrees tests 
These are being added back as unit tests.
 2016-01-21 15:13:02 -06:00
Kris Raney
16e8b4f9e3 cut-and-paste error 2016-01-21 13:23:52 -06:00
Mike Place
0f5baa65ea Fix missing key in opts for event tests 2016-01-21 11:06:03 -07:00
Justin Findlay
66f06f2bd3 disable pkgrepo test for ubuntu 15.10+ 2016-01-21 10:55:37 -07:00
Kris Raney
14f7bf693b Pylint fixes 2016-01-21 11:37:43 -06:00
Kris Raney
4ad20f6217 Not satisfied with the code complexity/ readability/ maintainability, so refactor a bit. Fix a couple bugs in the process. Add unit tests. 2016-01-21 11:28:53 -06:00
Kris Raney
917f48d19f Implement unit tests for boto_s3_bucket module 2016-01-21 11:25:55 -06:00
Evan Borgstrom
e148ea2d52 Allow recursive salt:// imports 
Fixes #30465
 2016-01-20 11:29:00 -08:00
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
Justin Findlay
fb9972f590 modules.pkg: disable repo int test for ubuntu 15.10 2016-01-19 15:27:12 -07: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
18b4b829e9 . adjust regex to account for the presence/absence of version strings on 
module names (depends on whether or not they're used in the requirements
file)

. finish generalizing pip_successful_install utility function
 2015-12-28 18:48:16 +00:00
Stephen D. Spencer
7373758237 fix indentiation 2015-12-28 18:02:24 +00:00
Stephen D. Spencer
22e89838f2 testing against stdout of a cli utility is for the birds. But I think 
these tests are properly capturing "Success" messages from pip
c.2013-c.2015
 2015-12-28 17:19:05 +00:00
Stephen D. Spencer
4ccfa921b3 add re.DOTALL flag to regex 2015-12-28 15:57:55 +00: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
Stephen D. Spencer
84031b6ce0 additional integration tests to verify chained requirements work 
properly when used in a list of requirements files
 2015-12-28 09:30:19 +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
Stephen D. Spencer
878def94fd pip,requirements filej chain support + requirements list arg support 
modules.pip:
 . `requirements` argument now properly supports requirements file
 chaining by default--`no_chown` not required)
 . `requirements` argument can be formed as a list
 . `requirements` files can still be formed as a comma-delimited list
 . both list structures support requirements file chaining

states.virtualenv_mod:
 . had to give states.virtualenv.managed() a little bit of attention to
 provide a cwd argument for modules.pip.installed().  This is done via
 os.path.dirname(os.path.abspath(requirements)) if a requirements
 argument is present

 tests.integration.modules.pip:
    . added:
        test_requirements_as_list__sans_no_chown___absolute_file_path
        test_requirements_as_list__sans_no_chown___non_absolute_file_path
        test_chained_requirements__sans_no_chown___absolute_file_path
        test_chained_requirements__sans_no_chown___non_absolute_file_path
    . all tests passed before commit
 2015-12-26 21:30:27 -06: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
3f324faa07 Merge pull request #29871 from skizunov/develop2 
Fixed Windows salt-master memory leaks in logger
 2015-12-21 11:10:10 -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
Sergey Kizunov
793c0bef75 Fixed Windows salt-master memory leaks in logger 
__process_multiprocessing_logging_queue:
- A leak was observed in this process on Windows. On Windows, creating a
new process doesn't fork (copy the parent process image). Due to this, we
need to setup extended logging inside this process. The leak was due to
the temp null and temp logging handlers being active which just store
messages but don't process them. Setting up extended logging removes
those handlers and fixes the leak (as well as properly dealing with
incoming logging messages).

setup_multiprocessing_logging:
- A leak was obversed in processes that used this on Windows. Similar
to above, due to lack of fork, the new process will have the temp null
and temp logging handlers enabled, causing the leak. In this function,
removing those handlers prevents the leak.

Signed-off-by: Sergey Kizunov <sergey.kizunov@ni.com>
 2015-12-20 09:05:19 -06: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
Nicole Thomas
cb10aad1b3 Merge pull request #29774 from cachedout/splay_jenkins 
Splay sleeps inside jenkins
 2015-12-16 16:55:53 -07:00
Thomas S Hatch
ab61f78295 Merge pull request #29775 from lyft/listen-id-declaration-resolution-stable 
Change listen requisite resolution from name to ID declaration
 2015-12-16 15:56:03 -07:00
Paul Fisher
ff3a809c11 Change listen requisite resolution from name to ID declaration 2015-12-16 13:54:49 -08:00
Mike Place
1c65cdcbc4 Splay sleeps inside jenkins 2015-12-16 14:48:51 -07:00
Mike Place
613213b921 Merge pull request #29757 from cachedout/refresh_db 
Skip refresh db test if upstream repo does not repsond.
 2015-12-16 13:23:16 -07:00
Mike Place
83df4c4c75 Skip refresh db test if upstream repo does not repsond. 2015-12-16 10:23:10 -07: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
14a19f9313 Merge pull request #29634 from cachedout/lint_29459 
Lint 29459
 2015-12-11 12:53:07 -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
Craig Rodrigues
381e8cc144 Use print as a function [PEP 3105]. 
This reduces warnings from the 2to3 utility
and future proofs the code when it is time to move to Python 3.
 2015-12-04 16:17:35 -08: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
6a7a95f28a Merge pull request #28501 from twangboy/jmoney_26898 
Requested fixes for 26898
 2015-12-02 18:12:12 -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
Mike Place
39667fda12 Merge pull request #29240 from clan/linux_acl 
handle acl_type [[d]efault:][user|group|mask|other]
 2015-12-01 10:56:20 -07:00
Justin Findlay
4d6c71aa80 modules.glusterfs: fix start_volume unit test 2015-12-01 10:53:32 -07:00
Mike Place
7e424e10f2 Merge pull request #28054 from dr4Ke/custom_grains_deep_merge 
loader uses a deep dictionary merge for the grains (core and customs)
 2015-12-01 10:33:52 -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
Z. Liu
02429aca69 handle acl_type [[d]efault:][user|group|mask|other] 2015-12-01 14:55:08 +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
Mike Place
d651d7167e Merge pull request #29067 from jacksontj/2015.8 
Fix infinite recursion in state compiler for prereq of SLSs
 2015-11-30 13:27:09 -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
2477ff2eab Add __init__ and pydsl test 2015-11-25 10:50:30 -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
Mike Place
063f075a99 Add integration renderer tests to the suite 2015-11-25 10:14:46 -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