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
bae454625f
Add boto_elasticsearch_domain module
2016-03-10 09:55:56 -06:00
rallytime
7476076ea3
Merge branch '2016.3' into 'develop'
...
Conflicts:
- salt/beacons/memusage.py
2016-03-07 14:13:14 -07:00
twangboy
75546eadaf
Fix tests for mac_utils
2016-03-04 16:36:02 -07:00
rallytime
4e88ffe3e4
Lint and change version added for #31673
...
Merges #31673
2016-03-04 15:02:19 -07:00
twangboy
6cf7a4b364
Add missing import
2016-03-04 10:55:23 -07:00
twangboy
5d6de86a25
Fix some lint
2016-03-04 10:53:11 -07:00
twangboy
88d5db9cdd
Add tests for remaining functions
2016-03-04 10:53:11 -07:00
twangboy
69aa8f8cbf
Add test for execute_return_success
2016-03-04 10:53:11 -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
Mike Place
78c89d22f5
Merge pull request #31637 from kraney/boto_cognitoidentity
...
pool_absent when the given pool name does not exist should return Tru…
2016-03-03 09:45:34 -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
Mike Place
bf4b651319
Merge pull request #31633 from rallytime/merge-develop
...
[develop] Merge forward from 2016.3 to develop
2016-03-02 15:09:36 -07:00
Winston Liu
a39d0d4312
pool_absent when the given pool name does not exist should return True instead of False.
2016-03-02 13:30:40 -08: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
kstreee
1c9e05249f
[ saltstack/salt#31534 ] Resolve data['arg'] type issue. Now rest_tornado can accept not only a list of string type for 'arg', but also a string type data for 'arg'.
2016-03-01 01:53:30 +00: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
Mike Place
e483978fc8
Merge pull request #31423 from twangboy/win_system_dev
...
Fix uppercase computer names
2016-02-25 09:15:58 -07:00
Bo Maryniuk
bc05acf7c3
Fix PyLint
2016-02-25 14:00:12 +01:00
Erik Johnson
9da467aec7
Rename core.py to core_test.py
2016-02-24 10:15:01 -07:00
Erik Johnson
468c637032
Add unit test for core grains
2016-02-24 10:15:01 -07:00
C. R. Oldham
db7b675b09
We need one more mocked return from listdir.
2016-02-24 10:15:00 -07:00
Nicolas Delaby
d2bcc37416
Pull missing images when calling dockerng.running
...
fixes #29727
2016-02-24 10:08:03 -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