Commit Graph

481 Commits

Author SHA1 Message Date
Justin Findlay
73e6388acd Merge pull request #24495 from jayeshka/rabbitmq_vhost_states-unit-test
adding states/rabbitmq_vhost unit test case.
2015-06-09 09:33:23 -06:00
Justin Findlay
bf1abccebe Merge pull request #24445 from jayeshka/pyrax_queues_states-unit-test
adding states/pyrax_queues unit test case.
2015-06-09 09:28:45 -06:00
Jayesh Kariya
31889e38eb cosmetic change. 2015-06-09 19:44:16 +05:30
Jayesh Kariya
cf501cf60d resolved error. 2015-06-09 18:10:37 +05:30
Jayesh Kariya
4bb6087722 Merge branch '2015.5' of https://github.com/saltstack/salt into rabbitmq_vhost_states-unit-test 2015-06-09 18:09:05 +05:30
Nicole Thomas
87e1c6008c Merge pull request #24459 from basepi/merge-forward-develop
Merge forward from 2015.5 to develop
2015-06-08 22:27:08 -06:00
Nicole Thomas
fce998a58b Merge pull request #24497 from jayeshka/rbenv_states-unit-test
adding states/rbenv unit test case.
2015-06-08 21:56:09 -06:00
Jayesh Kariya
79d343a62b adding states/rbenv unit test case. 2015-06-08 18:24:24 +05:30
Jayesh Kariya
3ad77143a8 adding states/rabbitmq_vhost unit test case. 2015-06-08 18:23:15 +05:30
Jayesh Kariya
7d96f27f91 adding states/rabbitmq_user unit test case. 2015-06-08 17:47:04 +05:30
Michael Steed
83a96367a4 Manual merge of #24414 per thatch45 2015-06-06 07:47:52 -06:00
Colton Myers
6d503c12ea Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop
Conflicts:
    doc/ref/modules/all/salt.modules.ipmi.rst
    doc/ref/modules/all/salt.modules.system_profiler.rst
    salt/fileclient.py
    salt/loader.py
    salt/modules/tls.py
    salt/modules/win_path.py
    salt/states/pkg.py
    salt/utils/event.py
    salt/utils/pagerduty.py
    tests/unit/modules/seed_test.py
2015-06-05 13:03:48 -06:00
Colton Myers
c0ff4110ab Merge pull request #24398 from makinacorpus/aptv
VirtualName for states.apt
2015-06-05 11:40:04 -06:00
Justin Findlay
36263405be Merge pull request #24447 from jayeshka/rabbitmq_policy_states-unit-test
adding states/rabbitmq_policy unit test case.
2015-06-05 09:26:10 -06:00
Jayesh Kariya
9b038abd63 adding states/rabbitmq_policy unit test case. 2015-06-05 17:35:31 +05:30
Jayesh Kariya
cb0c99a012 adding states/rabbitmq_plugin unit test case. 2015-06-05 17:33:49 +05:30
Jayesh Kariya
ea27cefb10 adding states/pyrax_queues unit test case. 2015-06-05 17:32:19 +05:30
Mathieu Le Marec - Pasquet
785d27707f VirtualName for states.apt
This fixes #24397

Signed-off-by: Mathieu Le Marec - Pasquet <kiorky@cryptelium.net>
2015-06-05 09:45:52 +02:00
Justin Findlay
84686ee695 Merge pull request #24403 from jayeshka/process_states-unit-test
adding states/process unit test case.
2015-06-04 09:19:01 -06:00
Justin Findlay
35de8d72db Merge pull request #24402 from jayeshka/pyenv_states-unit-test
adding states/pyenv unit test case.
2015-06-04 09:18:11 -06:00
Jayesh Kariya
5f263ab48b adding states/pyenc unit test case. 2015-06-04 17:50:04 +05:30
Jayesh Kariya
fcb71fb35e adding states/process unit test case. 2015-06-04 17:49:04 +05:30
Jayesh Kariya
49ff9272ce adding states/powerpath unit test case. 2015-06-04 17:47:39 +05:30
Colton Myers
baf4337918 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop
Conflicts:
    salt/modules/lxc.py
    salt/roster/clustershell.py
2015-06-03 13:47:08 -06:00
Thomas S Hatch
ae681a4db1 Merge pull request #24313 from nicholascapo/fix-22991-npm.installed-test-true
Fix #22991 Correctly set result when test=True
2015-06-03 08:49:18 -06:00
Thomas S Hatch
d57a9a267c Merge pull request #24312 from nicholascapo/fix-18966-file.serialize-test-true
Fix #18966: file.serialize supports test=True
2015-06-03 08:49:06 -06:00
Jayesh Kariya
fd1d834688 adding states/postgres_user unit test case. 2015-06-03 18:17:42 +05:30
Jayesh Kariya
0558b0d744 adding states/postgres_schema unit test case. 2015-06-03 18:16:27 +05:30
Nicholas Capo
ac9644cb19 Fix #22991 npm.installed correctly set result on test=True 2015-06-02 18:09:19 -05:00
Colton Myers
288d49e51c Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop
Conflicts:
    salt/modules/ipmi.py
2015-06-02 15:51:50 -06:00
Nicholas Capo
e7328e7043 Fix #18966 file.serialize correctly set result on test=True
* Use file.check_managed_changes to diff the file when test=True
2015-06-02 15:50:28 -05:00
Jayesh Kariya
a162ffa3d8 adding states/postgres_group unit test case. 2015-06-02 17:21:25 +05:30
Jayesh Kariya
3d465a574a adding states/postgres_extension unit test case. 2015-06-02 17:20:09 +05:30
Jayesh Kariya
ee06f1ad57 adding states/postgres_database unit test case. 2015-06-02 17:18:55 +05:30
Christophe Drevet-Droguet
8a63d1ebbe fix state grains silently fails #24319 2015-06-02 13:29:59 +02:00
Christophe Drevet-Droguet
ca1af20203 grains state: add some tests 2015-06-02 13:29:52 +02:00
Colton Myers
c4f5e231fa Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop2
Conflicts:
    doc/_themes/saltstack2/layout.html
    doc/conf.py
    doc/index.rst
    doc/ref/modules/all/salt.modules.hipchat.rst
    doc/topics/releases/index.rst
    salt/client/ssh/client.py
    salt/cloud/clouds/vsphere.py
    salt/modules/boto_dynamodb.py
    salt/modules/boto_route53.py
    salt/modules/data.py
    salt/modules/http.py
    salt/modules/tls.py
    salt/output/compact.py
    salt/states/boto_elb.py
    salt/states/linux_acl.py
    salt/states/rabbitmq_user.py
    salt/states/win_servermanager.py
    salt/utils/dictupdate.py
    salt/wheel/config.py
2015-05-29 15:10:13 -06:00
Jayesh Kariya
c23356500b adding states/quota unit test case. 2015-05-29 13:19:33 +05:30
Nicole Thomas
ce8e43b774 Merge pull request #24199 from lyft/route53-fix-elb
Various fixes for boto_route53 and boto_elb
2015-05-28 21:02:41 -06:00
Ryan Lane
d8dc9a7b5b Better unit tests for boto_elb state 2015-05-28 16:52:24 -07:00
Ryan Lane
62f214b535 Remove cnames_present test 2015-05-28 10:21:15 -07:00
Jayesh Kariya
657b709932 adding states/ports unit test case. 2015-05-28 17:11:41 +05:30
Colton Myers
116b88dac3 Fix mocking in file state unit tests 2015-05-27 14:55:34 -06:00
Nicole Thomas
7e400bc3d7 Merge pull request #24166 from jayeshka/pkgng-states-unit-test
adding states/pkgng unit test case.
2015-05-27 14:27:49 -06:00
Nicole Thomas
2303dec0e9 Merge pull request #24181 from jtand/file_test
Fixed error where file was evaluated as a symlink in test_absent
2015-05-27 12:26:28 -06:00
Nicole Thomas
a16276852b Merge pull request #24180 from terminalmage/fix-libvirt-test
Skip libvirt tests if not running as root
2015-05-27 12:18:47 -06:00
Nicole Thomas
1fbc5b25e6 Merge pull request #24165 from jayeshka/portage_config-states-unit-test
adding states/portage_config unit test case.
2015-05-27 11:15:08 -06:00
Nicole Thomas
4747856411 Merge pull request #24164 from jayeshka/pecl-states-unit-test
adding states/pecl unit test case.
2015-05-27 11:14:26 -06:00
Justin
5f0e601589 Fixed error where file was evaluated as a symlink in test_absent 2015-05-27 11:08:50 -06:00
Erik Johnson
72e7416ad2 Skip libvirt tests if not running as root
Running salt.states.libvirt.keys() results in an OSError if the pki dir
needs to be created.
2015-05-27 11:53:26 -05:00
Jayesh Kariya
8cf1505392 adding states/portage_config unit test case. 2015-05-27 14:55:31 +05:30
Jayesh Kariya
2234bb0b70 adding states/pkgng unit test case. 2015-05-27 14:54:19 +05:30
Jayesh Kariya
563a5b3c30 adding states/pecl unit test case. 2015-05-27 14:52:19 +05:30
Jayesh Kariya
1af8c8334d adding states/pagerduty unit test case. 2015-05-27 14:51:19 +05:30
Colton Myers
60f2e9eefb Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop
Conflicts:
    doc/topics/development/contributing.rst
    salt/modules/tls.py
2015-05-26 16:38:42 -06:00
Justin Findlay
a83371e0ed Merge pull request #24131 from jayeshka/mysql_user-states-unit-test
adding states/mysql_user unit test case
2015-05-26 09:58:10 -06:00
Justin Findlay
1dc1d2a6e5 Merge pull request #24130 from jayeshka/ntp-states-unit-test
adding states/ntp unit test case
2015-05-26 09:57:29 -06:00
Justin Findlay
39434179a8 Merge pull request #24128 from jayeshka/openstack_config-states-unit-test
adding states/openstack_config unit test case
2015-05-26 09:56:07 -06:00
Jayesh Kariya
ca09e0f7c1 adding states/openstack_config unit test case 2015-05-26 15:28:14 +05:30
Jayesh Kariya
ede4a9f2f1 adding states/ntp unit test case 2015-05-26 15:26:50 +05:30
Jayesh Kariya
c3ecabbae0 adding states/npm unit test case 2015-05-26 15:25:59 +05:30
Jayesh Kariya
ed1ef69856 adding states/mysql_user unit test case 2015-05-26 15:24:43 +05:30
Justin Findlay
ec509ed272 Merge pull request #24108 from jayeshka/mysql_query-states-unit-test
adding states/mysql_query unit test case
2015-05-25 06:30:48 -06:00
Jayesh Kariya
ec50450460 adding states/mysql_query unit test case 2015-05-25 15:59:25 +05:30
Jayesh Kariya
11a93cb80c adding states/mysql_grants unit test case 2015-05-25 15:58:10 +05:30
Jayesh Kariya
7d59deb3d6 adding states/file unit test case 2015-05-23 22:22:32 -06:00
Nicolas Delaby
82ee2da750 Enforce environment values to be strings. 2015-05-23 15:52:36 +02:00
Jayesh Kariya
a81a9225b8 adding states/mount unit test case 2015-05-22 14:56:56 -06:00
Justin Findlay
09de253373 Merge pull request #24024 from jayeshka/mongodb_user-states-unit-test
adding states/mongodb_user unit test case
2015-05-22 14:53:19 -06:00
Nicolas Delaby
1f68d2d9a9 Update test to follow new argument name 2015-05-22 18:36:50 +02:00
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
Jayesh Kariya
f31dc921f5 resolved errors 2015-05-22 10:48:28 +05:30
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
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
d038b1fdbb adding states/mongodb_user unit test case 2015-05-21 17:11:46 +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
Nicolas Delaby
5f8f24b655 Related to #23975 and apply same logic for ports and port_bindings 2015-05-21 09:49:21 +02: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
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
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
Thomas S Hatch
e97a9c4e93 Merge pull request #23851 from ticosax/fix-volumes
[dockerng] fix mounting
2015-05-19 09:47:55 -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
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
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