valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 17:09:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
67,198 Commits 24 Branches 182 Tags 341 MiB
a802663ad9
Commit Graph

6695 Commits

Author SHA1 Message Date
Nicole Thomas
cce0af9a2e Merge pull request #31792 from kraney/boto_elasticsearch 
Add boto_elasticsearch_domain module
 2016-03-11 08:57:27 -07: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
Nicole Thomas
4e0b44a1bb Merge pull request #31795 from rallytime/lint-31761 
Merge #31761 with lint fix
 2016-03-10 11:01:25 -07:00
Kris Raney
bae454625f Add boto_elasticsearch_domain module 2016-03-10 09:55:56 -06: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
170742f861 update tests with new changes structure 2016-03-09 19:16:40 +01: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
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
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
Nicole Thomas
36ce240596 Merge pull request #31583 from vutny/remove-trailing-white-spaces 
Remove trailing white spaces
 2016-03-02 08:38:01 -07:00
Denys Havrysh
86433f2378 Revert changes in files used by roots_test.py integration test 2016-03-02 10:00:45 +02:00
Justin Findlay
cbb28492a3 modules.mac_power: add unit tests 2016-03-01 12:19:04 -07:00
Denys Havrysh
e7a8dbf498 Remove trailing white spaces in tests files 2016-03-01 17:40:02 +02:00
Mike Place
7006a1eecf Fix failed unit test 2016-02-29 21:15:43 -07:00
Mike Place
ada5ab344d Merge pull request #31561 from jtand/beacons_test_fix 
Skipped test
 2016-02-29 21:11:22 -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
justinta89
196dd4db99 Skipped test 2016-02-29 14:21:19 -07:00
rallytime
b683df9b82 Pylint fix 2016-02-29 11:12:55 -07:00
rallytime
24505d2dcf Merge branch '2015.5' into '2015.8' 
Conflicts:
  - salt/client/ssh/state.py
  - salt/fileclient.py
  - salt/minion.py
 2016-02-29 10:47:40 -07:00
Mike Place
b9ca73d437 Merge pull request #31535 from kstreee/saltstack/salt#31534 
[saltstack/salt#31534] Resolve a bug that rest_tornado doesn't response for invalid and dictionary type of request body.
 2016-02-29 09:03:03 -07:00
kstreee
91b5dc7048 [saltstack/salt#31534] Resolve a bug that rest_tornado doesn't response for 1. invalid request, 2. dictionary type of request, and add test cases for it. 
Typo in __init__.py
 2016-02-29 17:59:16 +09:00
Erik Johnson
0d352bbc16 Add fileclient tests 2016-02-29 01:05:33 -06:00
rallytime
6a1a2f1316 Remove grains from TEST_SUITES dictionary - this dir doesn't exist 2016-02-26 13:29:44 -07:00
rallytime
fe35a88e28 Add test runner options that were lost in merge-forward 2016-02-26 11:38:21 -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