Commit Graph

2230 Commits

Author SHA1 Message Date
rallytime
093d833ff1 Merge branch '2016.3' into 'develop'
Conflicts:
  - pkg/osx/build.sh
2016-04-05 15:38:58 -06:00
rallytime
760f479424 Merge branch '2015.8' into '2016.3'
Conflicts:
  - salt/cli/daemons.py
  - salt/config/__init__.py
  - salt/scripts.py
  - salt/state.py
  - tests/unit/config/config_test.py
2016-04-05 15:09:27 -06:00
Justin Anderson
73118d0149 Deleted win_servermanger_test.py 2016-04-04 12:48:05 -06:00
Benjamin Drung
8cada9573f Fix typos of retrieve 2016-04-04 14:27:41 +02:00
Justin Findlay
e7ee59fb6c modules.parallels: add unit tests 2016-04-02 16:42:00 -06:00
rallytime
eb6773823b Merge branch '2016.3' into 'develop'
Conflicts:
  - salt/modules/rh_service.py
2016-04-01 10:33:44 -06:00
Mike Place
4ce67e6f2c Merge pull request #32120 from cmercier/firewalld
firewalld state/module : add runtime and persist + add rich_rules + merge bind and present
2016-03-31 10:20:19 -06:00
Erik Johnson
3e374e7ec6 Merge pull request #32243 from isbm/isbm-zypper-list-installed-ensure-latest
Ensure latest pkg.info_installed ensure latest
2016-03-31 11:09:59 -05:00
Mike Place
5ad98159af Fix unit test for mysql
Refs #32266
2016-03-31 08:45:17 -06:00
Clément Mercier
1c05ed120d firewalld state/module : add runtime and persist + add rich_rules + merge bind and present 2016-03-31 16:17:52 +02:00
Bo Maryniuk
73ad8a2bfc Fix lint 2016-03-31 01:55:38 +02:00
rallytime
ea3d21d126 Fix failing test 2016-03-30 16:53:42 -06:00
twangboy
b26cb76abb Fix unit tests 2016-03-30 16:51:58 -06:00
Bo Maryniuk
f07c7ea792 Add lowpkg tests for version comparison 2016-03-30 17:33:24 +02:00
Bo Maryniuk
afdf451d87 Remove tests from the zypper_test that belongs to rpm_test 2016-03-30 17:33:03 +02:00
twangboy
66afd4855c Fix unit tests 2016-03-30 08:56:49 -06:00
twangboy
93f252d868 Fix some pylint errors 2016-03-30 08:56:49 -06:00
twangboy
f5f7249c37 Fix unit tests 2016-03-30 08:56:49 -06:00
Justin Anderson
22ef15e9b7 Fixed boto_lambda_test
VpcConfig was not added to function_ret, which was causing
test_that_when_describing_function_it_returns_the_dict_of_properties_returns_true
to fail.
2016-03-29 16:32:57 -06:00
rallytime
fd0dd36b12 Lint develop branch 2016-03-28 11:47:41 -06:00
rallytime
d684d49490 Merge branch '2016.3' into 'develop'
Conflicts:
  - doc/topics/releases/2015.5.10.rst
  - doc/topics/releases/2015.8.8.rst
2016-03-28 11:16:22 -06:00
Mike Place
6ac3f4d0b4 Merge pull request #32138 from tegbert/fix-nova-driver-bug-parsing-ip-address
Fix nova driver bug parsing ip address
2016-03-28 10:08:32 -06:00
Mike Place
0bde9f0aef Merge pull request #32155 from cachedout/lint_32008
Lint 32008
2016-03-25 12:40:21 -06:00
rallytime
58c844a7d7 Add mac_desktop integration tests
- Updates mac_desktop module to use cmd.run_all
- Updates current mac_desktop_test unit tests with cmd.run_all change
- Adds integration tests for mac_desktop execution module
2016-03-24 17:02:53 -06:00
Mike Place
3b2c1ccf36 Merge pull request #32110 from rallytime/mac-desktop-tests
Add mac_desktop integration tests
2016-03-24 16:58:26 -06:00
Mike Place
1545b80017 Merge pull request #32034 from twangboy/mac_pkgutil_int
Integration tests for mac_pkgutil
2016-03-24 15:44:51 -06:00
Justin Anderson
f8080b8e59 Re-enable some skipped Boto tests 2016-03-24 10:30:48 -06:00
rallytime
34300847ec Fix test failures 2016-03-24 09:48:54 -06:00
rallytime
6b92ef1924 Add mac_desktop integration tests
- Updates mac_desktop module to use cmd.run_all
- Updates current mac_desktop_test unit tests with cmd.run_all change
- Adds integration tests for mac_desktop execution module
2016-03-23 17:31:41 -06:00
rallytime
55544a84a1 Merge branch '2016.3' into 'develop'
Conflicts:
  - salt/minion.py
2016-03-23 11:04:42 -06:00
Mike Place
e19fe847bd Merge pull request #32062 from rallytime/mac-assistive-tests
Mac assistive tests
2016-03-23 09:51:36 -06:00
Nicole Thomas
57cf405fd6 Merge pull request #31552 from alprs/fix-localectl
Bring back localectl parsing in locale module for when dbus module is unavailable
2016-03-23 09:47:27 -06:00
Nicole Thomas
37c410fee4 Merge pull request #32079 from rallytime/merge-32041
Merge #32041 with test removal
2016-03-23 09:42:35 -06:00
Kris Raney
3c6d0e8fc1 Make sure there are no connection object cache hits on boto_* unit tests. 2016-03-22 14:49:18 -06:00
Nicole Thomas
9216e303e1 Merge pull request #31961 from kraney/kraney_bugfix
Make sure there are no connection object cache hits on boto_* unit te…
2016-03-22 14:38:46 -06:00
rallytime
b1bdb688ae Add unit tests for new remove function, too. 2016-03-22 14:25:49 -06:00
rallytime
88ba210f86 Add mac_assistive integration tests
- Updates mac_assistive module to use cmd.run_all
- Updates current mac_assistive_test unit tests with cmd.run_all change
- Adds module integration tests for mac_assistive execution module
2016-03-22 14:11:40 -06:00
Stefan Schweer
bac08b24ec replaced ',' for whitespace as split seperator for rabbitmq tags
- fixed unit tests
2016-03-22 18:00:33 +01:00
Andreas Lutro
46018e4535 update kapacitor tests 2016-03-22 15:10:46 +01:00
Kris Raney
b4889024c5 Merge branch 'develop' into kraney_bugfix 2016-03-22 09:05:58 -05:00
Yaroslav Molocko
5312b87e20 k8s secrets and namespaces management 2016-03-22 14:21:11 +08:00
twangboy
7daf9d8277 Remove unit tests without logic 2016-03-21 17:47:34 -06:00
twangboy
5658753a5f Add already installed check 2016-03-21 17:33:25 -06:00
twangboy
933e275b3a Add integration tests 2016-03-21 15:03:31 -06:00
Andreas Lutro
a31cdf1968 Fix and improve locale module for systemd
- parse localectl output when dbus module is unavailable
- use dbus/localectl whenever the system is detected to have been booted
  with systemd as the init system, regardless of os grain
- simplify and improve logic when parsing dbus/localectl
  - don't rely on exceptions to find the end of the locale params
  - make sure that all locale params get returned
2016-03-21 20:22:16 +01:00
twangboy
100bcefa60 Fix unit tests 2016-03-21 12:15:08 -06:00
rallytime
37dee42061 Pylint fixes 2016-03-18 16:27:06 -06:00
rallytime
52111eb01a Merge branch '2016.3' into 'develop'
Conflicts:
  - salt/cloud/clouds/joyent.py
  - salt/minion.py
2016-03-18 16:00:35 -06:00
rallytime
4768bfafc6 Disable boto tests that are failing on develop 2016-03-18 14:02:06 -06:00
rallytime
a110b4d55d Don't overwrite previously mocked grains 2016-03-18 13:29:08 -06:00
rallytime
b2f3cc080f Disable more boto test classes that kill the test suite 2016-03-18 13:04:34 -06:00
rallytime
fa4650523e Pylint fixes 2016-03-18 12:21:09 -06:00
rallytime
6360ecd3b3 Merge branch '2015.8' into '2016.3'
Conflicts:
  - salt/cloud/clouds/scaleway.py
  - salt/config/__init__.py
  - salt/log/mixins.py
  - salt/minion.py
  - salt/modules/ps.py
  - salt/utils/decorators/__init__.py
  - salt/utils/schema.py
  - tests/unit/modules/etcd_mod_test.py
  - tests/unit/modules/file_test.py
2016-03-18 11:26:12 -06:00
rallytime
308aa5fd61 Merge branch '2016.3' into 'develop'
Conflicts:
  - conf/master
  - conf/minion
  - doc/ref/proxy/all/index.rst
  - salt/cli/daemons.py
  - salt/modules/key.py
  - salt/modules/reg.py
  - salt/modules/win_pkg.py
  - salt/utils/__init__.py
  - salt/utils/cloud.py
  - tests/unit/daemons_test.py
2016-03-18 10:57:15 -06:00
Kris Raney
890648aca0 Make sure there are no connection object cache hits on boto_* unit tests. 2016-03-17 15:07:43 -05:00
Justin Anderson
ef2db9a301 Skipping some boto tests that are broken 2016-03-17 11:05:43 -06:00
Pedro Algarvio
cb196803fd
Skip boto tests which are pegging CPU and eating all available RAM. 2016-03-17 01:01:24 +00:00
rallytime
892591a39c More pylint fixes 2016-03-15 15:50:05 -06:00
Daniel Hobley
415cc8efab Make sure we enable the proxy settings on windows 2016-03-15 12:02:12 +01:00
Mike Place
8e540af197 Remove useless mine tests
These are so heavily mocked that they test nothing.
2016-03-14 11:35:42 -06:00
Nicole Thomas
cce0af9a2e Merge pull request #31792 from kraney/boto_elasticsearch
Add boto_elasticsearch_domain module
2016-03-11 08:57:27 -07:00
Christophe Drevet-Droguet
dcd6f5a5a9 test for file.apply_template_on_contents 2016-03-11 12:44:26 +01:00
Kris Raney
b0f0601bfc More pylint fun 2016-03-10 21:02:06 -06:00
Kris Raney
3bcca37d80 Ah, pylint. Equal parts useful and annoying. 2016-03-10 20:57:03 -06:00
Kris Raney
70b9860b1a Fix pylint, doctstring, and tests in the case that boto3 is not installed 2016-03-10 17:09:52 -06:00
Kris Raney
15675c78c8 Add boto3 requirement to boto_vpc unit tests 2016-03-10 17:03:10 -06:00
Kris Raney
4161a7e789 Merge branch 'develop' into boto_vpc 2016-03-10 17:02:08 -06:00
rallytime
fe7ff0ebfa Merge branch '2015.8' into '2016.3'
Conflicts:
  - salt/cloud/__init__.py
  - salt/returners/smtp_return.py
2016-03-10 13:13:35 -07:00
Nicole Thomas
4e0b44a1bb Merge pull request #31795 from rallytime/lint-31761
Merge #31761 with lint fix
2016-03-10 11:01:25 -07:00
Justin Findlay
fe2fd3f993 modules.ps unit tests: check ps __virtual__ 2016-03-10 10:57:20 -07:00
Justin Findlay
eb2964d517 modules.mount unit tests: mock /etc/fstab 2016-03-10 10:57:20 -07:00
Justin Findlay
328d058f22 modules.linux_sysctl unit tests: mock ctl presence 2016-03-10 10:57:20 -07:00
Justin Findlay
590c0ad986 modules.btrfs unit tests: mock /proc/mounts 2016-03-10 10:57:20 -07:00
Justin Findlay
424a8b11bd modules.pw_group: mock (BSD) test to run on MacOS 2016-03-10 10:57:20 -07:00
Justin Findlay
0098c1c554 modules.blockdev test: mock utils.which 2016-03-10 10:57:19 -07:00
Kris Raney
bae454625f Add boto_elasticsearch_domain module 2016-03-10 09:55:56 -06:00
Bo Maryniuk
ee1a002673 Update test case to cover SLE11 and SLE12 2016-03-10 13:26:15 +01:00
Bo Maryniuk
4b134fb2ab Add SLE11 product info snapshot, rename previous 2016-03-10 13:25:53 +01:00
Kris Raney
4611a9c570 Merge branch 'develop' into boto_vpc
Conflicts:
	salt/modules/boto_vpc.py
	salt/states/boto_vpc.py
2016-03-09 18:58:11 -06:00
Andreas Lutro
1f90583ee8 tweak behaviour and add tests for kapacitor 2016-03-09 08:15:58 +01:00
Kris Raney
4809e09f52 Fix pylint errors 2016-03-08 11:54:03 -06:00
rallytime
838dc12b77 Merge branch '2015.8' into '2016.3'
Conflicts:
  - salt/cli/daemons.py
  - salt/config/__init__.py
  - salt/exceptions.py
  - salt/pillar/foreman.py
  - salt/returners/local_cache.py
  - salt/states/saltmod.py
  - salt/utils/__init__.py
  - salt/utils/cloud.py

The merge conflicts in salt/cli/daemons.py are still present in this commit.
@s0undt3ch is going to resolve them after this commit.
2016-03-08 10:14:32 -07:00
rallytime
7476076ea3 Merge branch '2016.3' into 'develop'
Conflicts:
  - salt/beacons/memusage.py
2016-03-07 14:13:14 -07:00
Kris Raney
3487f55e83 Add NAT Gateway support to boto_vpc 2016-03-07 09:41:03 -06:00
rallytime
6559ea15b0 Merge branch '2015.5' into '2015.8'
Conflicts:
  - doc/glossary.rst
  - salt/config.py
  - tests/unit/modules/gpg_test.py
2016-03-06 10:59:46 -07:00
Mike Place
8b00513ebb Removed useless tests
These test nothing and break everytime the underlying implementation is changed.
2016-03-04 15:37:49 -07:00
rallytime
4e88ffe3e4 Lint and change version added for #31673
Merges #31673
2016-03-04 15:02:19 -07:00
Christophe Drevet-Droguet
12db98ea23 grains.get ordered parameter implementation 2016-03-04 09:19:30 +01:00
twangboy
e953d34492 Add back skipIf decorator 2016-03-03 10:45:57 -07:00
twangboy
2c4c81f55d Remove mock tests, only test _validate_minutes 2016-03-03 08:54:03 -07:00
twangboy
c181e9fcc5 Merge branch '2016.3' of https://github.com/saltstack/salt into mac_power_tests 2016-03-03 08:52:51 -07:00
rallytime
2ee175c6d3 Merge branch '2016.3' into 'develop'
Conflicts:
  - salt/fileclient.py
  - salt/modules/glusterfs.py
2016-03-02 13:48:11 -07:00
rallytime
ac69e4bf10 Fix merge bug caught by zypper test and user correct zypper test info 2016-03-02 12:19:47 -07:00
rallytime
031a75ca33 Merge branch '2015.8' into '2016.3'
Conflicts:
  - Contributing.rst
  - conf/master
  - doc/index.rst
  - doc/man/salt.7
  - pkg/suse/README.suse
  - salt/client/ssh/state.py
  - salt/minion.py
  - salt/modules/zypper.py
  - salt/utils/schedule.py
  - tests/unit/modules/zypper_test.py
2016-03-02 10:26:13 -07:00
twangboy
33da2c613e Add tests for the remainder of the functions 2016-03-02 10:20:00 -07:00
Justin Findlay
cbb28492a3 modules.mac_power: add unit tests 2016-03-01 12:19:04 -07:00
Mike Place
7006a1eecf Fix failed unit test 2016-02-29 21:15:43 -07:00
Mike Place
a0986739a7 Merge pull request #31505 from anonymouzz/develop
slack module: add slack incoming webhook support.
2016-02-26 08:29:10 -07:00
Michael Calmer
1425c6496c use specialized assert functions for tests 2016-02-26 13:54:15 +01:00
Michael Calmer
f266cfdaac test _zypper_check_result() 2016-02-26 13:54:15 +01:00
Michael Calmer
aff6467782 adapt tests to new zypper_check_result() output 2016-02-26 13:54:14 +01:00
Mikhail Sokolov
1535dceddd slack module: add slack incomming webhook suport. 2016-02-26 14:41:23 +07:00
rallytime
40cd0ac8fe Merge branch '2016.3' into 'develop'
Conflicts:
  - salt/states/file.py
  - tests/runtests.py
2016-02-25 16:21:15 -07:00
rallytime
a41ce26287 Actually mock cmd.run_all call... 2016-02-25 15:11:25 -07:00
rallytime
e8f5f9b67a Fix zypper_test: Zypper function uses cmd.run_all, not cmd.run in 2016.3 2016-02-25 14:23:36 -07:00
rallytime
3b74d123af Merge branch '2015.8' into '2016.3'
Conflicts:
  - salt/modules/selinux.py
  - salt/modules/zypper.py
  - salt/pillar/__init__.py
  - salt/states/dockerng.py
  - tests/runtests.py
2016-02-25 12:36:22 -07:00
hlub
1494c44918 Refactored GlusterFS support
Usage of GlusterFS states did not change except the state 'created' was deprecated in favor of more descriptive name 'volume_present'.
- Improved separation of functionality in the execution module from the states. Module functions now return booleans instead of varying
strings. Parsing those strings in the states was very error-prone. In glusterfs.peer() function this problem was earlier solved by returning
a dict containing both the exit value and output string of the gluster call. This could be a good idea, although without calling the gluster
calls twice, and applied to other functios too.
- Calls to gluster are now logged more verbosely, while a failing call no longer raises an immediate exception.
- Improved checking and verbosity in the state level. Cleaned code a lot, removed some bugs and other odd behaviour.
- Updated tests to match the changes. Refactored some test code to be more readable. Added assertions to test that some functions are not
called when things are already in the desired state. Preferred changing behaviour of the mocked functions while proceeding instead of listing
all of the return values first.
- Replaced glusterfs.list_peers() with more informative peer_status() and deprecated the old name. The function now returns a dict with UUIDs as its keys.
- glusterfs.info() can now be called without volume name. It always returns a dictionary. Use this function instead of status() in sates.
- Functions glusterfs.delete() and glusterfs.create() were deprecated and renamed to delete_volume() and create_volume().
2016-02-25 10:46:43 -07:00
Bo Maryniuk
d30f2e4627 Implement unit test for remove and purge 2016-02-25 17:48:03 +01:00
Bo Maryniuk
bc05acf7c3 Fix PyLint 2016-02-25 14:00:12 +01:00
C. R. Oldham
db7b675b09 We need one more mocked return from listdir. 2016-02-24 10:15:00 -07:00
Bo Maryniuk
c0eab8b549 Add space before "assert" keyword 2016-02-24 17:46:49 +01:00
Bo Maryniuk
6bcb89a8f6 Implement list packages test 2016-02-24 17:45:33 +01:00
Bo Maryniuk
78837d2926 Add mocking data 2016-02-24 17:45:23 +01:00
Bo Maryniuk
0b64b8137f Implement test for version compare, where python fall-back algorithm is called 2016-02-24 17:24:23 +01:00
Bo Maryniuk
18b30a3274 Implement test for version compare, where RPM algorithm is called 2016-02-24 17:24:05 +01:00
Bo Maryniuk
59eca53441 Adjust test case for the third package in the test static data 2016-02-24 16:06:53 +01:00
Bo Maryniuk
8034cf0b91 Add third test package static info 2016-02-24 16:06:33 +01:00
Bo Maryniuk
90f209569a Implement test for the upgrade_available 2016-02-24 15:52:18 +01:00
Bo Maryniuk
7eb5f19cb4 Implement test for latest_available 2016-02-24 14:10:07 +01:00
Bo Maryniuk
e372c0b596 Implement test for the info_available 2016-02-24 13:59:05 +01:00
Bo Maryniuk
447771c0fc Add Zypper static data for the available packages 2016-02-24 13:58:47 +01:00
Bo Maryniuk
6989871d27 Implement test for info_installed 2016-02-24 12:31:17 +01:00
Bo Maryniuk
0cc6bce4aa Use strings instead of unicode strings 2016-02-24 11:56:30 +01:00
Bo Maryniuk
3342c03987 Implement list upgrades test 2016-02-24 11:56:18 +01:00
Bo Maryniuk
8862d7af65 Add list upgrades Zypper static data 2016-02-24 11:55:59 +01:00
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
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
43d531b93d Merge pull request #31392 from vodik/nftables
Changes to nftables module
2016-02-23 09:15:01 -07:00
Mike Place
56a899c8d9 Remove useless test
This tests absolutely nothing and has no real point.
2016-02-22 16:26:30 -07:00
C. R. Oldham
f3fec5562e We need one more mocked return from listdir. 2016-02-21 21:55:08 -07:00
rallytime
38f89bf8fd Merge branch '2016.3' into 'develop'
Conflicts:
  - salt/beacons/inotify.py
  - salt/beacons/load.py
2016-02-21 15:23:24 -07:00
Simon Gomizelj
c0ac0c0096 Fix check_table
The output of 'nft list tables' has the family included in the output
2016-02-20 21:32:48 -05:00
Mike Place
3832f9b874 Merge pull request #30979 from dschaller/npm-cache-clean
Adding NPM cache_cleaned state & module functions
2016-02-18 14:51:04 -07:00
rallytime
01aa33ac12 Merge branch '2015.8' into '2016.3' 2016-02-18 11:13:23 -07:00
Mike Place
74a8f008f5 Merge pull request #31143 from kraney/boto_apigateway
Boto apigateway
2016-02-17 15:17:16 -07: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
rallytime
73d73e80c1 Merge branch '2016.3' into 'develop'
Conflicts:
  - doc/topics/releases/2015.8.4.rst
  - doc/topics/releases/2015.8.5.rst
  - doc/topics/thorium/index.rst
  - salt/cloud/clouds/opennebula.py
  - salt/engines/thorium.py
  - salt/loader.py
  - salt/modules/archive.py
  - salt/modules/boto_vpc.py
  - salt/modules/data.py
  - salt/modules/reg.py
  - salt/pillar/mysql.py
  - salt/runners/cache.py
  - salt/states/archive.py
  - salt/states/cron.py
  - salt/states/file.py
  - salt/states/glance.py
  - salt/states/reg.py
  - salt/thorium/__init__.py
  - salt/thorium/check.py
  - salt/thorium/file.py
  - salt/thorium/reg.py
  - salt/utils/jid.py
  - salt/utils/parsers.py
  - setup.py
2016-02-12 14:38:50 -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
Winston Liu
6006c404bc use itertools instead of zip. 2016-02-11 17:56:28 -08:00
Winston Liu
bc1a6ecec2 import zip from salt.ext.six.moves 2016-02-11 15:18:01 -08:00
Winston Liu
b994bcfae5 lint warnings/errors. 2016-02-11 14:24:35 -08:00
Winston Liu
19bbf51a2e resourcepath -> resourcePath for consistency naming. 2016-02-11 13:26:05 -08:00
Mike Place
f24954dde5 Merge pull request #31139 from exowaucka/develop
Improve %h and %u handling in SSH module
2016-02-11 14:13:05 -07:00
Alex Wauck
329b25b3f1 Improved ssh_auth path expansion test 2016-02-11 13:49:15 -06:00
justinta89
053ae0cae6 Updated tests to work with code deprecations 2016-02-11 11:22:35 -07:00
Winston Liu
59aaec3b4c fixed lint warnings. 2016-02-11 08:38:29 -08:00
Winston Liu
824960503c lint warnings/errors. 2016-02-10 15:05:53 -08: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
Winston Liu
7df27fe0c9 Merge branch 'boto_cognitoidentity' into boto_apigateway 2016-02-10 13:00:30 -08:00
Mike Place
2337951152 Merge pull request #31065 from jtand/debian_ip_test_fix
Updated to debian_ip_test to match with recent changes in #30989
2016-02-10 13:55:28 -07:00
Mike Place
7c07d0597b Merge pull request #31094 from kraney/boto_cognitoidentity
Boto cognitoidentity
2016-02-10 13:50:04 -07:00
Winston Liu
4ee6c93838 fixed lint warnings/errors. 2016-02-10 11:43:47 -08:00
Colton Myers
67e17b3022 Revert "Deprecated code removed. " 2016-02-10 11:40:48 -07:00
justinta89
7c6864a958 Searchdomain to search 2016-02-10 08:58:37 -07:00
Winston Liu
f21ebbd096 Merge branch 'boto_cognitoidentity' into boto_apigateway 2016-02-09 16:57:57 -08:00
Winston Liu
248707069c cleaned up a few naming inconsistencies. 2016-02-09 16:52:51 -08:00
justinta89
1a5e37cf93 Updated to debian_ip_test to match with recent changes in #30989 2016-02-09 16:39:05 -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
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
Derek Schaller
eaabcaec26 Fixing assumptions about results structure 2016-02-06 19:38:06 -08:00
Derek Schaller
de154d76ce Adding npm cache_cleaned state and required module functions 2016-02-06 15:27:00 -08:00
Tim Harper
b4fe9aaa11 fixes issue in which s3.role_arn was defaulting to ''
fixes #30899
2016-02-06 14:10:20 -07:00
Winston Liu
f0ede44345 added execution module and unit tests for AWS Cognito Identity service. 2016-02-05 18:57:13 -08:00
justinta89
7a4be37c06 data.py code deprecations and minor test changes 2016-02-05 15:11:26 -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
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
d340b5b8b0 Merge pull request #30883 from cachedout/fix_30601
Fix 30601
2016-02-04 13:58:53 -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
Mike Place
4f8264e28c Fix failing test 2016-02-03 16:53:22 -07:00
rallytime
b5ec0991b0 Pylint fix 2016-02-03 15:00:44 -07:00
Mike Place
618f823e21 Merge pull request #30774 from Unity-Technologies/feature/mac_package
Added ability to install PKG, DMG and APP files for OS X minions
2016-02-03 12:54:32 -07:00
Daniel Hobley
29a4c3958e Removed possible shell injections as requested by PR feedback 2016-02-03 08:44:13 +01: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
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
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
Mark Kimsal
3cf387a3c6 Return mock string as MagicMock object
Attempt to fix unit tests by passing desired string return value
wrapped up in a MagicMock object.
2016-02-01 12:40:24 -05:00
Mark Kimsal
16c3ca6039 Changes for lint 2016-02-01 12:02:11 -05: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
Daniel Hobley
8598262d4e Lint fixes 2016-02-01 14:50:13 +01:00