valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 01:18:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
53,587 Commits 24 Branches 182 Tags 341 MiB
7f42cde905
Commit Graph

4999 Commits

Author SHA1 Message Date
Nicolas Delaby
8b7ddcbbf7 Introduce check_is_running 2015-05-22 18:36:26 +02:00
Nicolas Delaby
09d934b1ac Fix pull images 
add support for use-case when a pulled new-image is forced but no new images
was downloaded from the registry.
 2015-05-22 15:51:27 +02:00
Nicolas Delaby
b681f71eb3 compare images by ID not by name 
Because the name can be no longer be correct if an active tag moved to a different image.
It happens frequently when working against `latest` tag.
 2015-05-22 14:31:19 +02:00
Colton Myers
58aed60838 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop 
Conflicts:
    salt/runners/lxc.py
 2015-05-21 11:27:52 -06:00
Justin Findlay
55c9245075 Merge pull request #24025 from jayeshka/timezone-unit-test 
adding timezone unit test case
 2015-05-21 10:50:53 -06:00
Justin Findlay
e243617659 Merge pull request #24023 from jayeshka/mongodb_database-states-unit-test 
adding states/mongodb_database unit test case
 2015-05-21 10:49:17 -06:00
Jayesh Kariya
1ec33e22a7 removed assertion error 2015-05-21 18:57:58 +05:30
Jayesh Kariya
5a9ac7effb adding states/mongodb_database unit test case 2015-05-21 17:09:20 +05:30
Jayesh Kariya
05c0a985db adding states/modjk_worker unit test case 2015-05-21 17:07:01 +05:30
Jayesh Kariya
16ecb28950 adding timezone unit test case 2015-05-21 17:05:56 +05:30
Nicolas Delaby
5f8f24b655 Related to #23975 and apply same logic for ports and port_bindings 2015-05-21 09:49:21 +02:00
rallytime
9e0ec07d85 Skip the gpodder pkgrepo test - they don't have vivid ppa up yet 2015-05-20 14:08:42 -06:00
Nicole Thomas
b39e2d950d Merge pull request #23975 from terminalmage/fix-docker-volumes 
Check for VOLUME lines in image
 2015-05-20 13:59:04 -06:00
Erik Johnson
8ad8b527b6 Update test to mock dockerng.history 2015-05-20 13:54:20 -05:00
Colton Myers
9dbafcc051 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop 
Conflicts:
    salt/cloud/clouds/digital_ocean_v2.py
    salt/modules/tls.py
 2015-05-20 11:59:59 -06:00
Justin Findlay
b06df57e03 Merge pull request #23970 from jayeshka/system-unit-test 
adding system unit test case
 2015-05-20 11:12:57 -06:00
Justin Findlay
38d5f75756 Merge pull request #23967 from jayeshka/memcached-states-unit-test 
adding states/memcached unit test case
 2015-05-20 11:12:26 -06:00
Jayesh Kariya
89eb00815e adding system unit test case 2015-05-20 16:06:10 +05:30
Jayesh Kariya
422a96497d adding states/modjk unit test case 2015-05-20 15:31:46 +05:30
Jayesh Kariya
8ef9240e25 adding states/memcached unit test case 2015-05-20 15:30:45 +05:30
Justin Findlay
f09b80a8b5 augeas.change state now returns changes as a dict 2015-05-19 21:10:11 -06:00
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
dce9b540a6 Remove extra line 2015-05-18 14:49:27 -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
4acf58e758 Switch digital ocean tests to v2 driver 
This has been done on develop, but this handles the cloud test failures for 2015.5.
 2015-05-18 13:44:08 -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