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
67,197 Commits 24 Branches 182 Tags 341 MiB
830e270a93
Commit Graph

6695 Commits

Author SHA1 Message Date
justinta89
b3c1fa8de2 Fixed lint errors 2016-02-17 15:01:59 -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
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
Justin Findlay
a119fa0e66 tests/unit/utils/url_test.py: remove env support 2016-02-16 20:33:23 -07:00
Justin Findlay
4e709ab2be tests/unit/pydsl_test.py: remove env support 2016-02-16 20:33:23 -07:00
Justin Findlay
728f4e6c05 tests/integration/states/compiler.py: remove env support 2016-02-16 20:33:23 -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
Derek Schaller
8d7ab01c67 Fixing npm cache cleaned lint errors 2016-02-12 20:35:13 -08:00
Derek Schaller
6c88c43f28 Merging in cachedout's test fixes 2016-02-12 20:09:22 -08:00
Derek Schaller
4a133d5ddc cache_clean should return a mocked value 2016-02-12 19:51:22 -08: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
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
justinta89
d43d24ba6c Added more basic unit tests to unit.utils.network 2016-02-12 13:07:07 -07:00
Ch3LL
9204e3f562 add integration test for issue 30934w 2016-02-12 12:21:50 -07:00
LoveIsGrief
04795b1fd2 Add a little more information to the heavy virtualbox tests 
Related to saltstack/salt#27089 Saltcloud virtualbox provider
 2016-02-12 19:50:19 +01: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
Mike Place
498dec2e91 Fix tests 2016-02-12 10:56:01 -07:00
LoveIsGrief
6704ad31b4 Remove unused param 
Related to saltstack/salt#27089 Saltcloud virtualbox provider
 2016-02-12 18:36:33 +01: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
LoveIsGrief
a944c5d86d Fix python3 pylint error 
Related to saltstack/salt#27089 Saltcloud virtualbox provider
 2016-02-12 17:41:40 +01:00
Colton Myers
0a7b958ae3 Fix s3 test for new kms_keyid parameter/return 2016-02-12 09:21:49 -07:00
LoveIsGrief
bb6ffa80e2 from ... import ... on top for lint? 
Related to saltstack/salt#27089 Saltcloud virtualbox provider
 2016-02-12 14:08:45 +01:00
LoveIsGrief
3cd04cbccc Remove unused function 
Related to saltstack/salt#27089 Saltcloud virtualbox provider
 2016-02-12 12:35:32 +01:00
Derek Schaller
b5815d367e Reset the name to valid package in npm cache_cleaned unit test 2016-02-11 22:22:21 -08: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
Derek Schaller
47f8aeee97 Cleaning up npm cache_cleaned unit tests expected response 2016-02-11 20:39:42 -08:00
Derek Schaller
fe56101584 Update unit test to reflect npm ls directory structure 2016-02-11 19:41:08 -08: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
justinta89
61e80d7e2f Added more unit tests to unit.utils.network 2016-02-11 15:52:13 -07: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
Mike Place
52f6887124 Lint 2016-02-11 13:52:59 -07:00
Alex Wauck
329b25b3f1 Improved ssh_auth path expansion test 2016-02-11 13:49:15 -06:00
justinta89
cfc7075c44 Lint and test fixes 2016-02-11 11:22:35 -07:00
justinta89
053ae0cae6 Updated tests to work with code deprecations 2016-02-11 11:22:35 -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
Winston Liu
59aaec3b4c fixed lint warnings. 2016-02-11 08:38:29 -08:00
LoveIsGrief
7965eaab3c Attempt to fix more pylint errors and warnings 
Related to saltstack/salt#27089 Saltcloud virtualbox provider
 2016-02-11 16:58:57 +01:00
LoveIsGrief
4eab39e9ca Attempt to fix pylint errors and warnings 
Related to saltstack/salt#27089 Saltcloud virtualbox provider
 2016-02-11 13:56:38 +01:00
Ch3LL
af82b1233a integration test for issue #31014 2016-02-10 21:46:22 -07:00
Winston Liu
824960503c lint warnings/errors. 2016-02-10 15:05:53 -08: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
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
LoveIsGrief
17735df82d Move risky event into try/except 
It might leave the test env in a dirty state, maybe further tests might fail, but we have the log to trace it back to that

Related to saltstack/salt#27089 Saltcloud virtualbox provider
 2016-02-10 21:53:21 +01:00
Mike Place
7c07d0597b Merge pull request #31094 from kraney/boto_cognitoidentity 
Boto cognitoidentity
 2016-02-10 13:50:04 -07:00
LoveIsGrief
e5f8227e90 Move @skipIf to parent classes 
Related to saltstack/salt#27089 Saltcloud virtualbox provider
 2016-02-10 21:39:37 +01:00
LoveIsGrief
54db49b843 Remove some TODOs 
Related to saltstack/salt#27089 Saltcloud virtualbox provider
 2016-02-10 21:39:37 +01:00
LoveIsGrief
53c7cd87ca When creating a machine return a dict 
Related to saltstack/salt#27089 Saltcloud virtualbox provider
 2016-02-10 21:39:36 +01:00
LoveIsGrief
66114293bf Introduce timeout helper 
This should help us stop copy-pasting the calculations to let us timeout functions

Related to saltstack/salt#27089 Saltcloud virtualbox provider
 2016-02-10 21:39:36 +01:00
LoveIsGrief
95ab35203d Redtest to stop and restart a machine multiple times 
Related to saltstack/salt#27089 Saltcloud virtualbox provider
 2016-02-10 21:39:36 +01:00
LoveIsGrief
6cfb447cff Introduce profiles for testing 
* virtualbox-deploy-conf won't deploy a script
* virtualbox-minion will do a full deploy with a minion config

Related to saltstack/salt#27089 Saltcloud virtualbox provider
 2016-02-10 21:39:36 +01:00
LoveIsGrief
1a8cd747c5 Feature: deploy salt on machine when creating 
We need to setup the tests with a profile that wants to deploy and use the profile

Related to saltstack/salt#27089 Saltcloud virtualbox provider
 2016-02-10 21:39:36 +01:00
LoveIsGrief
7b4142dff3 Improve output JSON interpretation cleaning for tests 
(Actually also fix it because we we popping increasing random elements from the output... not good)

Related to saltstack/salt#27089 Saltcloud virtualbox provider
 2016-02-10 21:39:35 +01:00
LoveIsGrief
63edda4b50 New function for ip addresses 
Waits on the guest to have one.

Related to saltstack/salt#27089 Saltcloud virtualbox provider
 2016-02-10 21:39:35 +01:00
LoveIsGrief
f56d72b69f Helper functions should do what they are named for 
New helpers also added to describe the state of the machine

Related to saltstack/salt#27089 Saltcloud virtualbox provider
 2016-02-10 21:39:35 +01:00
LoveIsGrief
ef24a16f4e Remove unneeded test 
Related to saltstack/salt#27089 Saltcloud virtualbox provider
 2016-02-10 21:39:35 +01:00
LoveIsGrief
7c4b3580f1 Try and stop the running VM as a cleanup 
Related to saltstack/salt#27089 Saltcloud virtualbox provider
 2016-02-10 21:39:35 +01:00
LoveIsGrief
1d6b94c279 Starting machines works now too 
Related to saltstack/salt#27089 Saltcloud virtualbox provider
 2016-02-10 21:39:35 +01:00
LoveIsGrief
8111dcb092 Force actions in tests 
Otherwise there is always a confirmation prompt... ain't nobody got time fo' dat!

Related to saltstack/salt#27089 Saltcloud virtualbox provider
 2016-02-10 21:39:35 +01:00
LoveIsGrief
59d212acb1 Provider is getting deprecated in the config 
Related to saltstack/salt#27089 Saltcloud virtualbox provider
 2016-02-10 21:39:35 +01:00
LoveIsGrief
04c3bae44f Move some common test functions to helpers 
Introduce stop machine test (it's red :( )

Related to saltstack/salt#27089 Saltcloud virtualbox provider
 2016-02-10 21:39:35 +01:00
LoveIsGrief
1b3d96fa9f First test to get network address from already running guest 
Related to saltstack/salt#27089 Saltcloud virtualbox provider
 2016-02-10 21:39:35 +01:00
LoveIsGrief
b195d0f1a7 Use dict output for VirtualboxTests 
This should make the output from salt-cloud more verifiable and make tests more reliable

Related to saltstack/salt#27089 Saltcloud virtualbox provider
 2016-02-10 21:39:35 +01:00
LoveIsGrief
13d49278f0 A little PEP8 cleaning 
Related to saltstack/salt#27089 Saltcloud virtualbox provider
 2016-02-10 21:39:35 +01:00
LoveIsGrief
b0752a3d82 Implement list_nodes_select 
Related to saltstack/salt#27089 Saltcloud virtualbox provider
 2016-02-10 21:39:35 +01:00
LoveIsGrief
3b052215e2 Implement function show_image 
Related to saltstack/salt#27089 Saltcloud virtualbox provider
 2016-02-10 21:39:35 +01:00
LoveIsGrief
a1c94bf01b Red-test: list_nodes_full 
Related to saltstack/salt#27089 Saltcloud virtualbox provider
 2016-02-10 21:39:34 +01:00
LoveIsGrief
f4386c9be1 Tests and templates for starting and stopping VMs 
Related to saltstack/salt#27089 Saltcloud virtualbox provider
 2016-02-10 21:39:34 +01:00
LoveIsGrief
8c7e885537 Improve the output of list_nodes 
Related to saltstack/salt#27089 Saltcloud virtualbox provider
 2016-02-10 21:39:34 +01:00
LoveIsGrief
abf139a531 Output the default information expected for list_nodes 
This still needs to be enriched

Related to saltstack/salt#27089 Saltcloud virtualbox provider
 2016-02-10 21:39:34 +01:00
LoveIsGrief
20b574abef Improve XPCOM to dict conversion 
Allow passing tuples of attributes and their default values in case they don't exist in the xpcom object

Related to saltstack/salt#27089 Saltcloud virtualbox provider
 2016-02-10 21:39:34 +01:00
LoveIsGrief
2439d61b02 Improve XPCOM to dict conversion 
We will need this in the future when listing machines and requesting attributes that don't exist (yet)

Related to saltstack/salt#27089 Saltcloud virtualbox provider
 2016-02-10 21:39:34 +01:00
LoveIsGrief
ec50b5ca51 Remove list_available_images 
Following a discussion about it, the function just doesn't apply to virtualbox
virtalbox doesn't have a concept of "templates" so we can't list them

Related to saltstack/salt#27089 Saltcloud virtualbox provider
 2016-02-10 21:38:54 +01:00
LoveIsGrief
f4094ae320 Implement instance destruction 
Related to saltstack/salt#27089 Saltcloud virtualbox provider
 2016-02-10 21:38:54 +01:00
LoveIsGrief
38526b2c51 Move virtualbox functions to their own utility module 
Related to saltstack/salt#27089 Saltcloud virtualbox provider
 2016-02-10 21:38:54 +01:00
LoveIsGrief
00229e200c List all available images in virtualbox 
Does virtualbox have templates?

Related to saltstack/salt#27089 Saltcloud virtualbox provider
 2016-02-10 21:38:54 +01:00
LoveIsGrief
16f44f425b move vbox to its own function 
Related to saltstack/salt#27089 Saltcloud virtualbox provider
 2016-02-10 21:38:54 +01:00
LoveIsGrief
3a27c9bbf6 Check existence without an exception 
Related to saltstack/salt#27089 Saltcloud virtualbox provider
 2016-02-10 21:38:54 +01:00
LoveIsGrief
14b5e9b7b9 Test creating a virtual machine with salt-cloud 
Related to saltstack/salt#27089 Saltcloud virtualbox provider
 2016-02-10 21:38:54 +01:00
LoveIsGrief
8009f3bc16 Unit tests for xpcomt to dict conversion 
Related to saltstack/salt#27089 Saltcloud virtualbox provider
 2016-02-10 21:38:54 +01:00
LoveIsGrief
df789aeeec Use the constants for testing 
Related to saltstack/salt#27089 Saltcloud virtualbox provider
 2016-02-10 21:38:54 +01:00
LoveIsGrief
50c36b02da Set default log level to INFO 
Fix log lines

Related to saltstack/salt#27089 Saltcloud virtualbox provider
 2016-02-10 21:38:54 +01:00
LoveIsGrief
459eaa8945 More rigorous setup precautions for tests 
Related to saltstack/salt#27089 Saltcloud virtualbox provider
 2016-02-10 21:38:54 +01:00
LoveIsGrief
2342940f64 Remove unnecessary import 
Related to saltstack/salt#27089 Saltcloud virtualbox provider
 2016-02-10 21:38:54 +01:00
LoveIsGrief
98ad2cbe71 Add virtualbox to profile checks 
Virtualbox needs the 'clonefrom' property and it doesn't need size

Related to saltstack/salt#27089 Saltcloud virtualbox provider
 2016-02-10 21:38:54 +01:00
LoveIsGrief
1995b9ad14 PEP8 docstrings 
double quotes instead of single quotes

Related to saltstack/salt#27089 Saltcloud virtualbox provider
 2016-02-10 21:38:11 +01:00
LoveIsGrief
1545c9de7f Setup testing for calls to salt-cloud 
Related to saltstack/salt#27089 Saltcloud virtualbox provider
 2016-02-10 21:38:11 +01:00
LoveIsGrief
4a1a6a962f Move around files for clarity and separation 
Related to saltstack/salt#27089 Saltcloud virtualbox provider
 2016-02-10 21:38:11 +01:00
LoveIsGrief
b9ec577d11 Add basic configuration for the tests 
Related to saltstack/salt#27089 Saltcloud virtualbox provider
 2016-02-10 21:38:11 +01:00
LoveIsGrief
c4cb16c379 Post-merge organization 2016-02-10 21:38:11 +01:00
LoveIsGrief
c07cd63678 Improve tests 
Test VM creation, destruction and cloning
 2016-02-10 21:37:31 +01:00
LoveIsGrief
ed76f648f6 Create a basic VirtualBoxTestCase with helper assertions 2016-02-10 21:37:31 +01:00
LoveIsGrief
22e5936336 Move out basic virtualbox functions and introduce basic tests 2016-02-10 21:36:45 +01:00
LoveIsGrief
bc929b4948 Simple tests to get a feel of the virtualbox api 
These aren't unit tests (yet)
 2016-02-10 21:35:02 +01:00
LoveIsGrief
849858b878 Herp derp frist! 2016-02-10 21:35:02 +01: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
Winston Liu
efc374f968 'comment' fix up's in the returned dictionary. 2016-02-10 09:42:14 -08: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
ce206c1e28 present and absent states added for cognito identity pool. 2016-02-09 16:54:05 -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
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
Derek Schaller
fc2b60effe Cleaning up logic in unit tests for cache_cleaned state 2016-02-09 09:13:17 -08:00
justinta89
e07a667dde Lint Fix 2016-02-09 08:46:22 -07:00
Derek Schaller
2e3ebf806e Update npm state return name to None in unit tests 2016-02-08 22:00:18 -08:00
Derek Schaller
b020169ec7 Use the variable value in unit tests instead of hardcoded string 2016-02-08 20:57:47 -08:00
Derek Schaller
a824f56216 Update expected NPM cache_cleaned response to include name 2016-02-08 20:18:16 -08:00
Derek Schaller
8437cba2e6 Undo unintended unit test changes to npm bootstrap 2016-02-08 19:29:12 -08: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
Derek Schaller
b83fb3e857 Adding patch for error before npm cache_cleaned unit test 2016-02-08 09:16:48 -08: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
abednarik
b20738a5a1 File state born deprecations. 
Removed all Boron warning and deprecated code.
 2016-02-08 10:01:28 -03:00
Derek Schaller
c53824b111 npm unit test updates 2016-02-06 23:38:49 -08:00
Derek Schaller
67fb81dd93 Salt specific lint fixes 2016-02-06 22:10:59 -08:00
Derek Schaller
ec1965bc0f Removing duplicate splitstrings on result stdout 2016-02-06 21:07:41 -08:00
Derek Schaller
eaabcaec26 Fixing assumptions about results structure 2016-02-06 19:38:06 -08:00
Derek Schaller
5c0f9eb8f9 Documentation updates 2016-02-06 18:29:35 -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
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
911cb0a856 Merge pull request #30879 from rhansen/docker-dont-remove-volume-if-driver-differs 
Don't delete a Docker volume if the volume's driver differs
 2016-02-04 14:04:44 -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
d340b5b8b0 Merge pull request #30883 from cachedout/fix_30601 
Fix 30601
 2016-02-04 13:58:53 -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
Richard Hansen
6b5b2c063d 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-03 22:32:20 -05:00
Richard Hansen
255f5a1b91 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-03 19:32:13 -05:00
rallytime
adb85892de Fix failing state module tests 2016-02-04 00:01:11 +00: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
Mike Place
a901601211 Merge pull request #30797 from rhansen/docker-volume-driver 
don't delete existing Docker volume if driver unspecified
 2016-02-03 09:34:30 -07:00
Mike Place
5827347884 Merge pull request #30844 from terminalmage/pr-30703 
Perform initial gitfs/git_pillar fetch when init'ing remotes on masterless minion
 2016-02-03 09:31:21 -07:00
Daniel Hobley
29a4c3958e Removed possible shell injections as requested by PR feedback 2016-02-03 08:44:13 +01:00
Erik Johnson
58c4c01743 Add __role to master opts for gitfs integration tests 2016-02-02 21:58:50 -06:00
Erik Johnson
20c8badf4c Add __role to master opts for gitfs integration tests 2016-02-02 21:29:39 -06:00
Richard Hansen
cbda6446df 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-02 19:24:44 -05: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
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
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
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
Daniel Hobley
f701547027 Added ability to install PKG, DMG and APP files for OS X minions 2016-02-01 14:22:22 +01:00