Mike Place
70681bf03b
Fix for mock state PR #30118
2016-01-06 15:10:19 -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
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
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
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
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
Andreas Lutro
ca290ec3e1
change how alternatives states check for installed
2015-12-28 12:31:19 -07: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
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
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
Andreas Lutro
51088d938a
add tests, rename a function to more closely mirror influxdb
2015-12-17 21:58:51 +01: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
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
Andreas Lutro
7c69c177ed
update test
2015-12-09 13:18:47 +01:00
Colton Myers
e59364ad1d
Fix failing unit test
2015-12-08 13:45:34 -07: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
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
Justin Findlay
48e7beb0eb
modules.status: add in_seconds option to uptime
...
Implements #29311 .
2015-12-04 18:52:59 -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
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
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
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
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
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
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
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
Tim Harper
e060986828
add support to s3 for aws role assumption
2015-11-28 00:57:45 -07: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
2477ff2eab
Add __init__ and pydsl test
2015-11-25 10:50:30 -07:00
Mike Place
063f075a99
Add integration renderer tests to the suite
2015-11-25 10:14:46 -07:00
Mike Place
81bf332be4
Migrate pydsl tests to integration test suite
...
This marks the beginning of a migration of the pydsl renderer tests
to the integration test suite and away from the unit test suite.
The unit test approach is becoming too difficult to maintain due to its complex approach to trying to internally manage a highstate run instead of calling into the salt state system to fully manage it.
2015-11-24 15:46:14 -07:00
Mike Place
68d6c454b8
Merge pull request #29141 from optix2000/full_sls_import
...
Add test case for require: sls with only import statements
2015-11-24 09:17:57 -07:00
Nicolas Delaby
e98d18ba41
Expose docker networking as state
2015-11-24 13:55:22 +01:00
Nicolas Delaby
17ff5c1ab5
Add expose networking to modules.dockerng
2015-11-24 13:55:22 +01:00
Weilu Jia
596843e8d6
Add test case for sls with only import
...
Tests https://github.com/saltstack/salt/issues/10852
2015-11-23 18:27:56 -08:00
Weilu Jia
64e439cda2
Add test for infinite recursion with sls prerequisites
2015-11-23 09:12:06 -08:00
Mike Place
714ef8ff27
Merge pull request #29057 from lyft/file-manage-local-source-list
...
Add local file support for file.managed source list
2015-11-19 14:57:34 -07:00
Mike Place
b692ab1cfb
Merge pull request #29047 from schwing/fix-gpg-exception
...
Fix salt.modules.gpg.import_key exception: 'GPG_1_3_1 referenced before assignment'
2015-11-19 12:07:36 -07:00
