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

6591 Commits

Author SHA1 Message Date
Bo Maryniuk
4d38d318f4 Implement error handling test for listing upgrades 2016-02-24 11:55:34 +01:00
Bo Maryniuk
53338402a5 Use renamed zypper products data file 2016-02-24 11:21:11 +01:00
Bo Maryniuk
c6135975b0 Rename Zypper products static test data file 2016-02-24 11:20:53 +01:00
justinta89
fd1e2838ea Lint 2016-02-23 19:40:42 -07:00
justinta89
421a112914 Added config_dir to test minion config 2016-02-23 19:40:22 -07:00
justinta89
bf6a4c0983 Fixed lint error 2016-02-23 16:20:06 -07:00
justinta89
3566fbbcca More updates to beacons test 2016-02-23 16:19:07 -07:00
justinta89
37c4bf22d2 Updated beacons integration test 2016-02-23 15:46:21 -07:00
rallytime
1931c61563 Only run this pkg.info_installed test on distros that have that func 2016-02-23 15:22:14 -07:00
Justin Findlay
f671c3bf3b tests.runtests: add minion test runner 2016-02-23 13:47:47 -07:00
rallytime
0488668a00 Fix lowpkg.info function for Ubuntu 12 - make sure we have a pkg name 
Fixes #31370
 2016-02-23 11:09:36 -07:00
Bo Maryniuk
e87864986d Add Zypper unit test: test_list_products and test_refresh_db 2016-02-23 17:35:48 +01:00
Bo Maryniuk
cd6419fc9c Add Zypper Unit Test installed products sample data 2016-02-23 17:34:37 +01:00
Mike Place
64ed9fcd01 Merge pull request #31418 from terminalmage/fix-debian-grains 
Fix core grains when Debian OS detected as 'Debian GNU/Linux'
 2016-02-23 08:49:49 -07:00
Erik Johnson
5c833efc01 Support running grains tests 2016-02-22 21:55:32 -06:00
Erik Johnson
0e0cd17160 Rename core.py to core_test.py 2016-02-22 21:54:49 -06:00
Erik Johnson
d3cd1b596d Add unit test for core grains 2016-02-22 16:37:03 -06:00
justinta89
6db628be1a Basic integration tests for beacons execution module 2016-02-22 11:22:34 -07:00
Mike Place
e1ade05e54 Merge pull request #31355 from rallytime/fix-31330 
Fix orchestrate outputter when retcode is appended to orchestrate run
 2016-02-22 11:13:07 -07:00
Erik Johnson
c7bd13c9c9 Merge pull request #31376 from cro/suse_service2 
Some distros don't have a /lib/systemd
 2016-02-22 12:11:39 -06:00
Mike Place
268180f49b Merge pull request #31386 from rallytime/merge-2016.3 
[2016.3] Merge forward from 2015.8 to 2016.3
 2016-02-22 10:43:32 -07:00
Mike Place
105821efc7 Merge pull request #31352 from ticosax/pull-image-on-running 
[dockerng] Pull missing images when calling dockerng.running
 2016-02-22 09:54:10 -07:00
rallytime
8d928ab34a Pylint fix from wierd git behavior 2016-02-22 09:24:13 -07:00
justinta89
3b238c2e68 Started adding beacons execution module tests 2016-02-22 08:53:02 -07:00
C. R. Oldham
f3fec5562e We need one more mocked return from listdir. 2016-02-21 21:55:08 -07:00
rallytime
4baea26c58 Merge branch '2015.8' into '2016.3' 
Conflicts:
  - doc/topics/netapi/index.rst
  - salt/modules/win_servermanager.py
  - salt/modules/zypper.py
 2016-02-20 12:27:41 -07:00
Justin Findlay
8623c24335 add integration tests for minion blackout 
Related to #30868.
 2016-02-19 18:04:31 -07:00
rallytime
28763be519 Remove unused import 2016-02-19 09:51:18 -07:00
rallytime
9b52e39e90 Add testcase for state.orchestrate output 2016-02-19 09:14:46 -07:00
Nicolas Delaby
8c86eeb4dc Pull missing images when calling dockerng.running 
fixes #29727
 2016-02-19 15:43:52 +01:00
Nicolas Delaby
a8dc33a5e3 Saltnado provide also get parameters to the context 2016-02-19 09:11:15 +01:00
Mike Place
f0ba9c1eca Merge pull request #31326 from ticosax/2015.8-dockerng-detect-settings-removal 
[dockerng ] Detect settings removal
 2016-02-18 15:02:50 -07:00
Mike Place
02f79dc2b3 Merge pull request #31322 from rallytime/merge-2016.3 
[2016.3] Merge forward from 2015.8 to 2016.3
 2016-02-18 14:28:02 -07:00
Nicolas Delaby
7bedd86ebe Add detection of removed settings. 
When removing settings from dockerng.running state definition,
changes where ignored as `_compare()` was iterating only over user defined
parameters.

By looping over all available options we are now sure to not miss
removed entries.

Extend definition of expected default values:

 - Some default values are predictable and hardcoded in the VALID_CREATE_OPTS dict.
 - Some default needs to be read from images (`image_path`)
 - Some defaults values are unpredictable (hostname, mac_address)
 we are comparing desired value against value reported by the container
 (`get_default_from_container`).
 2016-02-18 20:23:31 +01:00
rallytime
01aa33ac12 Merge branch '2015.8' into '2016.3' 2016-02-18 11:13:23 -07:00
rallytime
7ea9dacbdd Merge branch '2015.8' into '2016.3' 
Conflicts:
  - salt/beacons/inotify.py
  - salt/beacons/load.py
  - salt/minion.py
  - salt/modules/win_update.py
  - salt/modules/yumpkg.py
  - salt/utils/pkg/rpm.py
 2016-02-18 11:10:44 -07:00
Mike Place
fe316eb3d2 Merge pull request #31265 from terminalmage/issue9272 
Add skip_verify argument to file.managed state
 2016-02-18 10:15:16 -07:00
Erik Johnson
cf2ce95e61 Update test to reflect new position of contents param 
The addition of the new skip_verify argument to
salt.modules.file.manage_file() means that the position of contents
param in returner.call_args[0] has changed. This commit updates this
test to reflect the new position.

Additionally, a comment has been added to hopefully make failures in
this test easier to grok for people moving forward.
 2016-02-17 20:54:44 -06:00
Joe Julian
783e9b2e13 Rework tests and fix reverse peering with gluster 3.7 
Reworked the test structure design for the gluster module and state so I
could create a test that mimiced the behavior difference between 3.7 and
prior versions when reverse probing by ip a server that already exists.

Added the additional data given by gluster 3.7 to the output of
glusterfs.list_peers to allow us to compare a requested peering against
a host's aliases.

Fixes #30932
 2016-02-17 13:10:07 -08:00
Ch3LL
da9bca625e pkg.latest epoch test for 2016 2016-02-17 09:51:11 -07:00
rallytime
023ad4635c Merge branch '2015.5' into '2015.8' 
Conflicts:
  - salt/modules/win_update.py
  - salt/states/win_update.py
 2016-02-17 09:33:08 -07:00
Mike Place
52a3c9b0c9 Merge pull request #31130 from ticosax/saltnado_pass_get 
Saltnado: provide also get parameters to the context
 2016-02-16 10:18:52 -07:00
Nicolas Delaby
f0a6d2b814 Saltnado provide also get parameters to the context 2016-02-15 10:09:02 +01:00
Mike Place
c5e5af827c Merge pull request #31171 from Ch3LL/megan-20158 
added logic to check for installed package
 2016-02-12 15:10:21 -07:00
Mike Place
a024d3536f Merge pull request #31177 from Ch3LL/test_content_pillars 
add integration test for issue #30934
 2016-02-12 15:09:31 -07:00
Ch3LL
9204e3f562 add integration test for issue 30934w 2016-02-12 12:21:50 -07:00
Ch3LL
a12e2f566b fix lint error 2016-02-12 11:38:29 -07:00
Ch3LL
a123efd4ef added logic to check for installed package 2016-02-12 11:01:35 -07:00
Tarjei Husøy
ceae2a16f8 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.
 2016-02-12 10:24:50 -07:00
Erik Johnson
23b6c08727 Lint fixes for merge-forward 2016-02-12 10:44:18 -06:00
Colton Myers
0a7b958ae3 Fix s3 test for new kms_keyid parameter/return 2016-02-12 09:21:49 -07:00
Colton Myers
076b49a4ca Merge remote-tracking branch 'upstream/2015.8' into merge-forward-2016.3 
Conflicts:
    README.rst
    doc/conf.py
    doc/ref/index.rst
    doc/ref/proxy/all/salt.proxy.ssh_sample.rst
    doc/topics/installation/rhel.rst
    doc/topics/releases/2015.8.4.rst
    doc/topics/tutorials/states_pt5.rst
    salt/cloud/clouds/ec2.py
    salt/cloud/clouds/opennebula.py
    salt/config/__init__.py
    salt/modules/boto_dynamodb.py
    salt/modules/boto_ec2.py
    salt/modules/boto_elasticache.py
    salt/modules/boto_elb.py
    salt/modules/boto_iam.py
    salt/modules/boto_rds.py
    salt/modules/boto_sns.py
    salt/modules/boto_sqs.py
    salt/modules/dracr.py
    salt/modules/git.py
    salt/modules/mine.py
    salt/modules/systemd.py
    salt/modules/win_pkg.py
    salt/modules/yumpkg.py
    salt/pillar/__init__.py
    salt/states/git.py
    salt/states/rabbitmq_vhost.py
    salt/states/saltmod.py
    salt/utils/pkg/rpm.py
    setup.py
    tests/unit/modules/systemd_test.py
    tests/unit/states/rabbitmq_vhost_test.py
 2016-02-11 22:33:49 -07:00
Mike Place
b831e0a865 Merge pull request #31131 from Ch3LL/megan-20158 
integration test for issue #31014
 2016-02-11 10:33:23 -07:00
Mike Place
a4040da46d Fix bad unit test 2016-02-11 10:31:40 -07:00
Ch3LL
af82b1233a integration test for issue #31014 2016-02-10 21:46:22 -07:00
rallytime
742d0a6b04 Change all relevant Boron references to 2016.3.0 
And more Boron deprecation warnings to Carbon
 2016-02-10 15:45:28 -07:00
Mike Place
c56a819fd8 Merge pull request #31108 from jtand/npm_test_fix 
Changed npm integration test to install request.
 2016-02-10 14:52:02 -07:00
Mike Place
5bf5848e04 Fixup unit test 2016-02-10 14:36:21 -07:00
justinta89
a5eac47b25 Changed npm integration test to install request. 
Later versions of npm were having trouble installing pm2 with the git link.
 2016-02-10 14:31:16 -07:00
Mike Place
de1abae9d1 Merge pull request #31105 from cachedout/lint_30975 
Lint 30975
 2016-02-10 14:11:21 -07:00
Mike Place
446b4c2aff Lint #30975 2016-02-10 14:04:59 -07:00
Colton Myers
67e17b3022 Revert "Deprecated code removed. " 2016-02-10 11:40:48 -07:00
Mike Place
c73b5a4a66 Fix boto_secgroup 2016-02-09 11:52:15 -07:00
Mike Place
25bcc68357 Fix boto test failures 2016-02-09 11:50:26 -07:00
Mike Place
c3f115724a Merge pull request #30987 from youngnick/add-back-localhost-peer-handling 
Changed glusterfs.peer() module so state can handle localhost peering attempts.
 2016-02-09 10:51:58 -07:00
Mike Place
1950359580 Merge pull request #31012 from terminalmage/fix-gitfs-provider-lc 
Fix gitfs/git_pillar/winrepo provider to allow lowercase values
 2016-02-09 10:24:25 -07:00
justinta89
e07a667dde Lint Fix 2016-02-09 08:46:22 -07:00
Nick Young
730b5ef3e2 Update tests to cover new peering return val. 2016-02-09 10:58:44 +11:00
justinta89
321ce95dd5 Lint Fix 2016-02-08 16:14:51 -07:00
justinta89
6269c2088a Updated data_test to match with deprecations. 2016-02-08 15:43:12 -07:00
Erik Johnson
763581798b Add unit tests to ensure a valid provider 2016-02-08 15:18:11 -06:00
Mike Place
3b7b6f2398 Merge pull request #31002 from rmtmckenzie/cloud-lxc-provide-fix 
Fix lxc cloud provided minion reporting present
 2016-02-08 11:14:50 -07:00
justinta89
56efb2d06a File state born deprecations. 
Backport of #30988
 2016-02-08 10:13:15 -07:00
justinta89
962e0deda5 Fixed rabbitmq_vhost test failure. 2016-02-08 10:02:43 -07:00
Morgan McKenzie
9b17fdce5e Fix lxc cloud provided minion reporting present 
LXC minion is reporting as present when configured
with cloud state, even though it is not.

Fixes issue #31000
 2016-02-08 15:06:56 +00:00
Tim Harper
b4fe9aaa11 fixes issue in which s3.role_arn was defaulting to '' 
fixes #30899
 2016-02-06 14:10:20 -07:00
justinta89
7a4be37c06 data.py code deprecations and minor test changes 2016-02-05 15:11:26 -07:00
Mike Place
d9785451c0 Merge pull request #30941 from rallytime/bp-30879 
Back-port #30879 to 2015.8
 2016-02-05 14:15:20 -07:00
justinta89
99ca683734 Removed deprecated cache.grains code and the outputter test 2016-02-05 10:37:18 -07:00
Richard Hansen
eb6f289fc1 change default for volume_present()'s force parameter to False 
This is safer, as it avoids surprising the user with permanent data
loss.
 2016-02-05 09:41:19 -07:00
Richard Hansen
34f3057e04 add 'force' to replace (or not) volumes with driver mismatch 
Add a new 'force' option that will cause volume_present() to delete
and re-create a volume if the existing volume's driver doesn't match
the specified driver.  Set the default to True to preserve existing
behavior.
 2016-02-05 09:41:18 -07:00
justinta89
ef36afe5de Removed deprecated jid code and corresponding test 2016-02-05 09:05:54 -07:00
Joe Julian
f96650f3c3 Add realpath to lvm.pvdisplay and use it in vg_present 
Any sort of symlink could be used for inclusion into an lvm vg but lvm's
pvdisplay may show a real device name, or a mapper device name which is
a symlink.

Since we're interested in finding out if the actual device is part of
our volgroup, we test the realpath of both the device requested and the
device returned by pvdisplay to ensure they're the same device.

Fixes #26867 and #30882
 2016-02-04 17:21:38 -08:00
justinta89
b6605569e0 Adjusted another boto_vpc test 2016-02-04 15:45:18 -07:00
justinta89
9dec1aa622 Removed more deprecated code from boto_vpc and boto_vpc_test changes 2016-02-04 15:43:38 -07:00
justinta89
9b1e4b7ad7 Removed test for deprecated mysql_query 2016-02-04 15:33:08 -07:00
justinta89
a678b045e8 mysql pillar deprecated code removed 2016-02-04 15:26:28 -07:00
justinta89
4d77156758 Removed deprecated code from boto_vpc.py and adjusted boto_vpc_test.py to match changes. 2016-02-04 14:36:15 -07:00
Mike Place
4ae2d829f0 Merge pull request #30888 from ticosax/backport-30797 
Backport #30797 to 2015.8
 2016-02-04 14:02:25 -07:00
Mike Place
4372851ad9 Merge pull request #30895 from bdrung/2015.8 
Fix various typos
 2016-02-04 13:55:10 -07:00
Colton Myers
89bac9076a Merge pull request #30867 from rallytime/boto-utils-fix 
Pass in 'pack' variable to utils.boto.assign_funcs function from ALL boto modules
 2016-02-04 11:37:05 -07:00
rallytime
6ad7642f6d Lint 2016-02-04 11:00:02 -07:00
rallytime
58778dfc88 Fix failing boto_vpc module unit tests 2016-02-04 10:33:41 -07:00
Benjamin Drung
56ce7479b1 Fix typo catched -> caught 2016-02-04 12:57:20 +01:00
Richard Hansen
68b51be869 add additional states.dockerng.volume_present() unit tests 
The unit tests now test for the bug fixed in the previous commit
(among other things).
 2016-02-04 10:07:51 +01:00
rallytime
adb85892de Fix failing state module tests 2016-02-04 00:01:11 +00:00
rallytime
b5ec0991b0 Pylint fix 2016-02-03 15:00:44 -07:00
Erik Johnson
58c4c01743 Add __role to master opts for gitfs integration tests 2016-02-02 21:58:50 -06:00
Erik Johnson
ef14956db0 Integration test for #30820 2016-02-02 15:34:19 -06:00
Mike Place
ec4e2bb9bb Merge pull request #30823 from yannis666/fix-for-mine-update-merge2 
Fix for mine to merge configuration on update.
 2016-02-02 13:21:24 -07:00
Mike Place
a3feba4a26 Merge pull request #30826 from cachedout/fix_30682 
Fix 30682
 2016-02-02 12:40:05 -07:00
Mike Place
3b246db0b0 Fix stupid test 2016-02-02 12:39:24 -07:00
yannis
99c7c12aba Fix for mine to merge configuration on update. 
This fix was previously applied to 2015.5.
It fixes #30722
 2016-02-02 10:43:00 -08:00
Mike Place
e3f0c8e162 Merge pull request #30731 from Unity-Technologies/feature/osx_keychain 
Added the ability to configure keychains on OSX
 2016-02-02 08:03:14 -07:00
Mike Place
330abcad12 Merge pull request #30775 from Unity-Technologies/feature/mac_defaults 
Added the ability to set OS X settings using defaults
 2016-02-02 07:47:49 -07:00
Mike Place
e4ca01181b Merge pull request #30803 from Unity-Technologies/feature/win_certutil 
Added the ability to add and remove certificates from Windows minions
 2016-02-02 07:04:30 -07:00
Daniel Hobley
2567ea6956 Lint fixes 2016-02-02 11:48:17 +01:00
Daniel Hobley
becb643557 Added ability to install and activate a windows license 2016-02-02 11:07:05 +01:00
Daniel Hobley
ddc24708ad Added the ability to add and remove certificates from Windows minions 
- Uses certutil.exe to add and remove certificates
 2016-02-02 10:06:20 +01:00
Daniel Hobley
04877e06e7 Updated based on PR feedback 
- Renamed type to vtype
- Made if statements a little more clear
 2016-02-02 09:01:38 +01:00
Mike Place
86ea047933 Merge pull request #30734 from Unity-Technologies/feature/osx_assistive 
Added ability to change assistive access on OSX 10.9+
 2016-02-01 14:51:47 -07:00
Mike Place
abfdd3ee3c Merge pull request #30782 from jtand/cmdmod_script 
SyntaxError not appropriately caught.
 2016-02-01 13:12:29 -07:00
Mike Place
68f4fd2fb3 Merge pull request #30697 from Unity-Technologies/feature/proxy-settings 
Added ability to set proxy settings on OSX and Windows
 2016-02-01 13:04:59 -07:00
justinta89
9b5ce69a54 SyntaxError not appropriately caught. Further testing shows that python2.4 will use print() without an error. 2016-02-01 10:34:24 -07:00
Erik Johnson
8a836c88f4 Update systemd tests 2016-02-01 10:18:08 -06:00
Daniel Hobley
0a1da63d6a Added the ability to set OS X settings using defaults 2016-02-01 15:24:02 +01:00
Thomas S Hatch
e202ce1ce0 Merge pull request #30698 from Unity-Technologies/feature/win-firewall-icmp 
Added the ability to enable icmp rules on Windows Firewalls
 2016-01-31 12:09:29 -07:00
Thomas S Hatch
41858d2463 Merge pull request #30744 from jtand/cmdmod_script 
Adjusting script for cmd.script test
 2016-01-31 12:00:43 -07:00
Colton Myers
291fe929e4 Merge pull request #30754 from basepi/merge-forward-develop 
Merge forward from 2015.8 to develop
 2016-01-29 17:11:31 -07:00
Mike Place
b8a6a97307 Merge pull request #30695 from Unity-Technologies/feature/beacon-glxinfo 
Added a beacon for GLXInfo
 2016-01-29 17:13:20 -06:00
Mike Place
fe19ca4480 Merge pull request #30729 from Unity-Technologies/feature/dism 
Added DISM module and states
 2016-01-29 17:10:32 -06:00
Colton Myers
967e862027 Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 
Conflicts:
    salt/loader.py
    salt/modules/npm.py
    salt/pillar/__init__.py
 2016-01-29 15:51:52 -07:00
Colton Myers
84eeab7720 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 
Conflicts:
    salt/returners/local_cache.py
 2016-01-29 14:57:31 -07:00
justinta89
0acb145aa1 Adjusting script for cmd.script test 
After #29964 was merged the cmd.script and cmd.script_retcode tests on centos 5
started failing because the /usr/bin/env python version is the system default.
The script used print_fuction from __futures__ which was not introduced until
python2.6.

@The-Loeki, I noticed this after your changes to cmdmod function. If you have
thoughts or comments as to why this behavior changed after that, I'm all ears.
othersie, this should take care of the failures on centos 5 on jenkins.
 2016-01-29 11:52:17 -07:00
Daniel Hobley
6ad5014968 Lint fixes 2016-01-29 15:29:06 +01:00
Daniel Hobley
bb241c1931 Lint fixes 2016-01-29 15:18:16 +01:00
Daniel Hobley
a4f4e52687 Added xattr module and state for OS X 
- Allows you to add and remove special attributes to/from files
 2016-01-29 15:01:40 +01:00
Daniel Hobley
d80a637d2e Added ability to change assistive access on OSX 10.9+ 2016-01-29 13:59:51 +01:00
Daniel Hobley
3aeafd7f54 Lint fixes 2016-01-29 12:34:35 +01:00
Daniel Hobley
bae0543d95 Added the ability to configure keychains on OSX 2016-01-29 11:47:43 +01:00
Daniel Hobley
e8c3a154f0 Added DISM module and states 
- Allows you to install features and capabilities on windows minions
 2016-01-29 10:35:58 +01:00
Daniel Hobley
76a788529a Merge branch 'develop' into feature/win-firewall-icmp 2016-01-29 09:35:41 +01:00
Daniel Hobley
efdc953867 Merge branch 'develop' into feature/proxy-settings 2016-01-29 09:35:31 +01:00
Daniel Hobley
76aa2fde84 Merge branch 'develop' into feature/beacon-glxinfo 2016-01-29 09:35:15 +01:00
Daniel Hobley
9ecfb56c33 Fixed a bug where new changes are detected when nothing changed in proxy state 2016-01-28 15:06:06 +01:00
Daniel Hobley
e40092a103 Added the ability to enable icmp rules on Windows Firewalls 
- Added more checks in the unit tests
- Updated unit tests to check for ICMP rules
 2016-01-28 14:38:50 +01:00
Daniel Hobley
6f266cdd73 Added ability to set proxy settings on OSX and Windows 2016-01-28 13:21:15 +01:00
Steve Hajducko
3544dd995e Fix lsscsi issues for certain platforms 
The lsscsi command doesn't support the '-s' flag on any RHEL/CentOs system
until RHEL7.

The command now have an option to specify 'get_size' to enable
compatibility with the older platforms.

Also fixes some issues with lsscsi not being installed and exceptions
getting thrown because of that.
 2016-01-27 21:15:26 -08:00
rallytime
4fa80f2d5e Merge branch '2015.8' into 'develop' 
Conflicts:
  - doc/ref/states/all/index.rst
  - salt/cloud/__init__.py
  - salt/minion.py
  - salt/modules/file.py
  - salt/modules/guestfs.py
  - salt/modules/ipmi.py
  - salt/modules/osquery.py
  - salt/modules/parted.py
  - salt/modules/seed.py
  - salt/modules/virt.py
  - salt/modules/yumpkg.py
  - salt/modules/zypper.py
  - salt/states/boto_elb.py
  - salt/states/pkg.py
 2016-01-26 16:19:39 -07:00
Nicole Thomas
d6e2c7aa82 Merge pull request #30614 from techhat/depimg 
WIP: Deprecate salt/modules/img.py
 2016-01-26 15:03:11 -07:00
Joseph Hall
29df2124a2 Remove tests for img.py since we're deprecating it 2016-01-26 11:00:38 -07:00
Colton Myers
5bc11d7539 Merge pull request #30631 from rallytime/fix-7811 
Refactor rabbitmq_cluster states to use test=true functionality correctly
 2016-01-26 09:23:49 -07:00
Colton Myers
621d8785de Merge pull request #30579 from sjorge/module-localemod 
Fix up salt.modules.locale(mod) for Solaris and some generic improvements
 2016-01-25 17:21:42 -07:00
Colton Myers
64f17568a4 Merge pull request #30627 from sjmh/etcd_set_tree 
Add etcd update function
 2016-01-25 17:07:46 -07:00
rallytime
bf9ffded6d Refactor rabbitmq_cluster states to use test=true functionality correctly 
Fixes #7811
 2016-01-25 16:47:54 -07:00
Colton Myers
94bf7790cf Merge pull request #30567 from rallytime/fix-25363 
Make sure rabbitmq_vhost states are using test=true properly.
 2016-01-25 16:19:45 -07:00
Colton Myers
818ff2af78 Merge pull request #30381 from quantonganh/launchctl-yosemite 
Launchctl yosemite
 2016-01-25 16:08:25 -07:00
rallytime
1e8e86007c Refactor rabbitmq_policy states to use test=true functionality correctly 
Fixes #25658
 2016-01-25 15:21:19 -07:00
Steve Hajducko
a015473d4e Add etcd update function 
Adds a update function that takes a dict and sets multiple etcd keys.
 2016-01-25 14:13:33 -08:00
Nicole Thomas
653292ec88 Merge pull request #30555 from twangboy/mac_brew 
renamed brew.py to mac_brew.py
 2016-01-25 12:30:31 -07:00
Jorge Schrauwen
4d2fa2e2aa switch unit test to except CommandExecutionError 2016-01-25 19:30:09 +00:00
rallytime
3f8b905642 Fix test failures 2016-01-25 12:08:30 -07:00
Nicole Thomas
25f127c948 Merge pull request #30580 from sjorge/module-timezone 
salt.modules.timezone improvements for Solaris-like OS's
 2016-01-25 11:43:25 -07:00
Nicole Thomas
05349071dc Merge pull request #30503 from StackPointCloud/profitbricks-cloud-provider 
Adds cloud provider support for ProfitBricks
 2016-01-25 11:28:41 -07:00
Ethan Devenport
de7d1666f6 Updates made after PR review: 
* Improved and cleaned up documentation.
* Removed unnecessary namespaces.
* Made to fail when no ssh_host is found.
* Cleared pylint violations.
 2016-01-25 18:02:10 +00:00
Nicole Thomas
b8009d7320 Merge pull request #30552 from twangboy/mac_pkgutil 
Renamed darwin_pkgutil.py to mac_pkgutil.py
 2016-01-25 10:47:57 -07:00
Nicole Thomas
fb0054afb5 Merge pull request #30556 from twangboy/mac_sysctl 
rename darwin_sysctl.py to mac_sysctl.py
 2016-01-25 10:46:04 -07:00
Jorge Schrauwen
98664445c7 Swapping one unknow for debian failed, because debian use a different 
function internally. Switched to RedHat for the test as it returns
LANG=XYZ
 2016-01-25 17:38:51 +00:00
Jorge Schrauwen
e4c511de4a update tests, we have a correct return now 2016-01-25 17:30:23 +00:00
Jorge Schrauwen
745f203ea3 unit test, better to test with unknown os_family, we expect "" result without patching cmd.run 2016-01-23 22:56:00 +00:00
Jorge Schrauwen
d153f43771 unit test was filling in fake os_familiy, new code skips the expensive cmd_run unknown os_family 2016-01-23 22:53:07 +00:00
twangboy
cec969db15 Fixed more tests 2016-01-22 19:24:38 -07:00
twangboy
aa47a2908f Fixed more lint 2016-01-22 19:20:24 -07:00
twangboy
3fcf9b4ba8 Fixed some lint 2016-01-22 19:15:29 -07:00
twangboy
e09f43b11b even more lint 2016-01-22 19:09:08 -07:00
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