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
53,405 Commits 24 Branches 182 Tags 341 MiB
5d10934237
Commit Graph

4976 Commits

Author SHA1 Message Date
Colton Myers
622bda817f Merge pull request #23893 from basepi/merge-forward-develop 
Merge forward from 2015.5 to develop
 2015-05-19 11:23:15 -06:00
Colton Myers
ed3a71dc72 Fix scheduleadd test 2015-05-19 09:53:01 -06:00
Thomas S Hatch
e97a9c4e93 Merge pull request #23851 from ticosax/fix-volumes 
[dockerng] fix mounting
 2015-05-19 09:47:55 -06:00
Nicole Thomas
03317ec5d0 Merge pull request #23877 from rallytime/change_do_test_image 
Cloud tests should use an image that is LTS
 2015-05-18 16:16:43 -06:00
rallytime
7ed776c293 Cloud tests should use an image that is LTS 
Changes the test image to create for digital ocean cloud tests to be on Ubuntu 14.04, not 14.10
 2015-05-18 14:04:24 -06:00
rallytime
f45c7bdfca Add boilerplate unit test pieces to new dockerng_test file 
Also fixes pylint errors in original PR.

Refs #23851
 2015-05-18 13:04:14 -06:00
Colton Myers
6530a20340 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop 
Conflicts:
    pkg/suse/salt.changes
    salt/modules/lxc.py
    salt/modules/ps.py
    salt/states/cloud.py
 2015-05-18 11:39:43 -06:00
Justin Findlay
433f87372c Merge pull request #23863 from rahulhan/states_timezone_unit_test 
Adding states/timezone.py unit test
 2015-05-18 11:02:19 -06:00
Justin Findlay
37b3ee5421 Merge pull request #23862 from rahulhan/states_tomcat_unit_test 
Adding states/tomcat.py unit tests
 2015-05-18 11:02:10 -06:00
Justin Findlay
dde7207acb Merge pull request #23860 from rahulhan/states_test_unit_test 
Adding states/test.py unit tests
 2015-05-18 11:01:49 -06:00
Justin Findlay
3c9b8139e8 Merge pull request #23859 from rahulhan/states_sysrc_unit_test 
Adding states/sysrc.py unit tests
 2015-05-18 11:01:46 -06:00
Rahul Handay
72fcabc690 Adding states/timezone.py unit test 2015-05-18 21:25:03 +05:30
Rahul Handay
65d7752d2a Adding states/tomcat.py unit tests 2015-05-18 21:22:46 +05:30
Rahul Handay
1f4cf86500 Adding states/test.py unit tests 2015-05-18 21:18:47 +05:30
Rahul Handay
6a903b054d Adding states/sysrc.py unit tests 2015-05-18 21:04:03 +05:30
Nicolas Delaby
df48ac2b91 volumes path, on create, should be the one inside the container 
not from the host
 2015-05-18 14:30:44 +02:00
Jayesh Kariya
280abdec7c adding sysbench unit test case 2015-05-18 17:43:37 +05:30
Alexander Schwartz
f5b1734782 fixing problem in unit test 2015-05-17 17:09:35 +00:00
Alexander Schwartz
cba47f6856 make saltify to use standard boostrap procedure, therefore providing all options like master_sign_pub_file 2015-05-17 18:16:43 +02:00
Justin Findlay
a2e23fd162 Merge pull request #23716 from makinacorpus/i23713 
Correct detect service toggling
 2015-05-16 11:00:44 -06:00
Mathieu Le Marec - Pasquet
e26885d8cb lint 2015-05-16 14:21:17 +02:00
Mathieu Le Marec - Pasquet
bde7867c98 service/{dead/running} optimizations & test fixes 
Signed-off-by: Mathieu Le Marec - Pasquet <kiorky@cryptelium.net>
 2015-05-16 13:33:34 +02:00
Weilu Jia
64634b6349 Update psutil.pid_list to use psutil.pids 2015-05-15 14:25:03 -07:00
Weilu Jia
8a1da33ada Fix test cases by mocking psutil_compat 2015-05-15 14:11:12 -07:00
Weilu Jia
7d02ad4f06 Fix some of the mock names for the new API 2015-05-15 13:03:26 -07:00
Weilu Jia
93ee411fd5 Create compatability psutil. 
psutil 3.0 drops 1.0 API, but we still support old psutil versions.
 2015-05-15 13:03:25 -07:00
Colton Myers
4ea3f8f80a Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop 
Conflicts:
    salt/pillar/neutron.py
    salt/utils/http.py
 2015-05-15 13:43:40 -06:00
Justin Anderson
982f87316d Merge pull request #23781 from jfindlay/fix_locale_tests 
fix unit test mock errors on arch
 2015-05-15 13:40:07 -06:00
Justin Findlay
14c711eeb3 fix unit test mock errors on arch 2015-05-15 12:50:55 -06:00
Justin Findlay
aab9c431d0 Merge pull request #23777 from jfindlay/merge_23665 
Merge #23665
 2015-05-15 12:16:21 -06:00
Thomas S Hatch
8f53dd1912 Merge pull request #23749 from rallytime/remove_do_apiv1_tests 
Move digital_ocean_v2 tests to be the default/only cloud tests for digital ocean
 2015-05-15 12:13:53 -06:00
Thomas S Hatch
348645ecd5 Merge pull request #23736 from jfindlay/fix_pip 
always load pip execution module
 2015-05-15 12:10:16 -06:00
Thomas S Hatch
d951bc8ad4 Merge pull request #22548 from terminalmage/docker-ng 
Add docker-ng state module
 2015-05-15 12:09:58 -06:00
Justin Findlay
87e000d053 fix ssh module unit tests 2015-05-15 11:11:29 -06:00
Erik Johnson
150d4e25c7 Update unit.utils.utils_test.UtilsTestCase.test_clean_kwargs 
This reflects the new behavior in which all dunder kwargs are cleaned
 2015-05-15 11:17:28 -05:00
Justin Findlay
fd8a1b797f Merge pull request #23765 from jayeshka/makeconf_states-unit-test 
adding states/makeconf unit test case
 2015-05-15 08:29:43 -06:00
Jayesh Kariya
19939cfa98 adding svn unit test case 2015-05-15 17:39:21 +05:30
Jayesh Kariya
26e31afa31 adding states/makeconf unit test case 2015-05-15 17:37:53 +05:30
Javier Domingo
63620725c3 Remove trailing whitespace 2015-05-15 13:00:11 +02:00
Justin Findlay
b8867a8c23 update pip tests 2015-05-15 00:15:26 -06:00
Javier Domingo Cansino
5cab0ecc95 ssh: AuthorizedKeysFile expands defined tokens 2015-05-15 00:45:24 +02:00
rallytime
7e15ff94ff Move digital_ocean_v2 tests to be the defauly/only tests for digital ocean cloud tests 2015-05-14 15:25:00 -06:00
Justin Findlay
e90bb252d3 update debian_ip unit tests 
Related to 5ff749e4 (#23554).
 2015-05-14 13:45:06 -06:00
Colton Myers
7d8038f134 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop 
Conflicts:
    debian/changelog
    salt/modules/win_pkg.py
    salt/pillar/__init__.py
    salt/states/file.py
 2015-05-14 10:27:00 -06:00
Rahul Handay
aad27db513 Adding states/user.py unit tests 2015-05-14 21:28:37 +05:30
Justin Findlay
13facbf077 Merge pull request #23704 from jayeshka/lvs_server_states-unit-test 
adding states/lvs_server unit test case
 2015-05-14 08:22:10 -06:00
Jayesh Kariya
da323dab0b adding states/lvs_server unit test case 2015-05-14 14:54:29 +05:30
Jayesh Kariya
66717c8133 adding states/lvs_service unit test case 2015-05-14 14:53:26 +05:30
Justin Findlay
e480f13688 Merge pull request #23675 from basepi/merge-forward-2015.5 
[2015.5] Merge forward from 2014.7 to 2015.5
 2015-05-13 12:35:54 -06:00
Colton Myers
5ee7f25ee4 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop 2015-05-13 11:50:33 -06:00