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
55,217 Commits 24 Branches 182 Tags 341 MiB
07167422ba
Commit Graph

2795 Commits

Author SHA1 Message Date
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
Gareth J. Greenaway
c95f8be0ae Updating unit tests based on changes to module. 2015-06-04 20:33:52 -07:00
Justin
1df4020ec2 Changed mock path to be absolute in test_parse_targets 2015-06-04 11:11:33 -06:00
Justin Findlay
deaee68b89 Merge pull request #24371 from joejulian/2015.5_tls_module_tests 
2015.5 tls module tests
 2015-06-04 09:20:16 -06: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
Justin Findlay
632f838838 Merge pull request #24401 from jayeshka/powerpath-states-unit-test 
adding states/powerpath unit test case.
 2015-06-04 09:17:46 -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
Christophe Drevet-Droguet
7b9451451f module grains tests: test list order preservation 2015-06-04 09:52:09 +02:00
Justin
7570ae9132 Disabled flaky test to review later 2015-06-03 16:27:33 -06:00
Joe Julian
4c5dee1e25 Add @destructiveTest decorator to destructive tests 2015-06-03 15:27:05 -07:00
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
Colton Myers
d710489794 Merge pull request #24347 from basepi/merge-forward-develop 
Merge forward from 2015.5 to develop
 2015-06-03 09:38:49 -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
Joe Julian
274bbd4d43 Accept results from older pyOpenSSL 2015-06-02 18:17:05 -07:00
Joe Julian
161f913522 All cert info should be in UTC always 2015-06-02 18:17:05 -07:00
Joe Julian
9affcca766 See the whole diff if dict compare fails 2015-06-02 18:17:05 -07:00
Joe Julian
94f620857c Ignore extensions for now. Resolve this as part of fixing issue 24338. 2015-06-02 18:17:04 -07:00
Joe Julian
84904d31f1 Mask lint warning for unused imported module 2015-06-02 18:17:04 -07:00
Joe Julian
5675b78459 Do not test if PyOpenSSL is not installed 2015-06-02 18:17:04 -07:00
Joe Julian
563cc66311 Add tls tests 2015-06-02 18:17:04 -07:00
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
Christophe Drevet-Droguet
756f5d8716 new set function for module grains, and unit tests 2015-06-02 15:41:26 +02:00
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
Thomas S Hatch
ac1134af22 Merge pull request #24188 from aneeshusa/add-sqlite-pillar 
Add sqlite3 pillar
 2015-06-01 11:45:15 -06:00
Nicole Thomas
e7542e7a38 Merge pull request #24236 from jdsieci/develop 
RedHat IPv6 static routes
 2015-05-30 21:34:24 -06:00
Jerzy Drozdz
2f3d0298af pylint volation fixes 2015-05-30 02:04:49 +02:00
Colton Myers
5fcbcfe6d5 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop 
Conflicts:
    doc/topics/cloud/digitalocean.rst
    doc/topics/tutorials/index.rst
    salt/cloud/clouds/digital_ocean.py
    salt/modules/lxc.py
    salt/returners/__init__.py
 2015-05-29 17:33:28 -06:00
Jerzy Drozdz
9eb9892516 Changed return values and assertions to lists 2015-05-30 01:03:43 +02:00
Thomas S Hatch
a28515aa2c Merge pull request #23060 from makinacorpus/service 
ubuntu systemd/legacy init support
 2015-05-29 17:02:08 -06:00
Colton Myers
75590cf490 Merge pull request #24080 from makinacorpus/lxc_consistency2 
Lxc consistency2
 2015-05-29 16:51:54 -06:00
Jerzy Drozdz
e564a0b473 Added setting of __grains__['osrelease'] in test 2015-05-30 00:16:25 +02:00
Colton Myers
90cb448910 Fix rest of rabbitmq tests 2015-05-29 15:11:25 -06:00
Colton Myers
7736509c6b Fix rabbitmq test 2015-05-29 15:11:19 -06: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
Aneesh Agrawal
4b9311507c Add new module type for serializers from issue #22257. 
Move existing serializers from salt.utils.serializers to
salt.serializers.
 2015-05-28 20:03:11 -04:00
Ryan Lane
d8dc9a7b5b Better unit tests for boto_elb state 2015-05-28 16:52:24 -07:00
Thomas S Hatch
526698ba8d Merge pull request #24208 from jayeshka/ports-states-unit-test 
adding states/ports unit test case.
 2015-05-28 17:06:33 -06:00
Thomas S Hatch
3dc4b85295 Merge pull request #24190 from msteed/issue-23815 
Fix issue 23815
 2015-05-28 14:10:34 -06: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
Michael Steed
086a1a94e8 lint 2015-05-27 13:36:25 -06:00
Michael Steed
db9f6820b8 add inotify beacon unit tests 2015-05-27 13:26:36 -06:00
Aneesh Agrawal
ac4792f68d Add a SQLite3 ext_pillar built on the sql_base pillar. 2015-05-27 14:45:33 -04:00
Aneesh Agrawal
decb6cef97 Extract PEP 249 compliant sql_base ext_pillar from MySQL. 
Refactor the mysql ext_pillar so all PEP 249 generic code is in
sql_base to allow for easy addition of new ext_pillars.
 2015-05-27 14:45:33 -04: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
rallytime
ac0f97de51 Fixes the boto_vpc_test failure on CentOS 5 tests 
pkg_resources.get_distribution doesn't work on CentOS 5 since it looks
for moto in site-packages and not pip (which is how we're installing it
in the salt-jenkins states).

This catches the exception through by get_distribution so we can run the
rest of the tests in this file.
 2015-05-26 12:25:51 -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
Thomas S Hatch
f76622ad67 Merge pull request #24076 from garethgreenaway/refactoring_schedule_module 
Refactoring schedule module
 2015-05-25 13:45:50 -06:00
Thomas S Hatch
dd90ef09b9 Merge pull request #24078 from jfindlay/locale_charmap 
if a charmap is not supplied, set it to the codeset
 2015-05-25 13:39:19 -06:00
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
Justin Findlay
f2e5d6c2fd Merge pull request #24110 from jayeshka/varnish-unit-test 
adding varnish unit test case
 2015-05-25 06:30:21 -06:00
Jayesh Kariya
e11988969f adding varnish unit test case 2015-05-25 16:01:02 +05:30
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
Mathieu Le Marec - Pasquet
458f50617b seed: lint 
Signed-off-by: Mathieu Le Marec - Pasquet <kiorky@cryptelium.net>
 2015-05-24 14:50:24 +02:00
Mathieu Le Marec - Pasquet
96b8d55f14 Fix seed.mkconfig yamldump 
This fixes #24071

Signed-off-by: Mathieu Le Marec - Pasquet <kiorky@cryptelium.net>
 2015-05-24 14:07:07 +02:00
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
Justin Findlay
5eb97f0973 if a charmap is not supplied, set it to the codeset 
Fixes #23221.
 2015-05-22 14:48:39 -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
Gareth J. Greenaway
a09f0b23bd Updating schedule unit tests to align with refactoring changes. 2015-05-22 09:17:53 -07: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
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
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
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
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
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
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
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
Colton Myers
acdd3fc6bd Fix lint 2015-05-13 11:47:43 -06:00
Jayesh Kariya
17987d97f0 made changes to test_interfaces function. 2015-05-13 10:35:05 -06:00
Nicole Thomas
c1bdd4d377 Merge pull request #23651 from jayeshka/solr-unit-test 
adding solr unit test case
 2015-05-13 09:26:15 -06:00
Nicole Thomas
ee43411677 Merge pull request #23649 from jayeshka/libvirt_states-unit-test 
adding states/libvirt unit test case
 2015-05-13 09:24:48 -06:00
Nicole Thomas
c7fc466f1e Merge pull request #23648 from jayeshka/linux_acl_states-unit-test 
adding states/linux_acl unit test case
 2015-05-13 09:24:11 -06:00
Jayesh Kariya
3f0ab29eb0 removed error. 2015-05-13 18:02:35 +05:30
Jayesh Kariya
6e05148962 adding solr unit test case 2015-05-13 17:14:53 +05:30
Jayesh Kariya
11081c121c adding states/linux_acl unit test case 2015-05-13 17:12:28 +05:30
Jayesh Kariya
0fb923a283 adding states/libvirt unit test case 2015-05-13 17:11:09 +05:30
Jayesh Kariya
1987015033 adding states/kmod unit test case 2015-05-13 17:09:57 +05:30
Jayesh Kariya
0936e1d386 made changes to test_interfaces function. 2015-05-13 11:09:40 +05:30
Colton Myers
eca368a0ee Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop 2015-05-12 16:09:12 -06:00
Colton Myers
680e88f058 Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.5 
Conflicts:
    salt/modules/ebuild.py
    tests/unit/modules/grains_test.py
 2015-05-12 16:06:36 -06:00
Justin Findlay
d4f30955fa Merge pull request #23598 from rahulhan/states_win_dns_client_unit_test 
Adding states/win_dns_client.py unit tests
 2015-05-12 15:47:36 -06:00
Justin Findlay
811c6a1d89 Merge pull request #23597 from rahulhan/states_vbox_guest_unit_test 
Adding states/vbox_guest.py unit tests
 2015-05-12 15:46:30 -06:00
Nicole Thomas
b8589532d1 Merge pull request #23603 from rahulhan/states_winrepo_unit_test 
Adding states/winrepo.py unit tests
 2015-05-12 12:40:12 -06:00
Nicole Thomas
3cbbd6d277 Merge pull request #23602 from rahulhan/states_win_path_unit_test 
Adding states/win_path.py unit tests
 2015-05-12 12:39:37 -06:00
Nicole Thomas
3c904e8739 Merge pull request #23600 from rahulhan/states_win_network_unit_test 
Adding states/win_network.py unit tests
 2015-05-12 12:39:01 -06:00
Rahul Handay
6a2909eeea Removed errors 2015-05-12 23:20:36 +05:30
Rahul Handay
b418404eb7 removed lint error 2015-05-12 23:06:20 +05:30
Rahul Handay
a66e7e7f1f Adding states/winrepo.py unit tests 2015-05-12 22:54:54 +05:30
Rahul Handay
122c29f71a Adding states/win_path.py unit tests 2015-05-12 22:50:02 +05:30
Rahul Handay
1be802300b Adding states/win_network.py unit tests 2015-05-12 22:45:25 +05:30
Rahul Handay
6cda890517 Adding win_firewall.py unit tests 2015-05-12 22:39:09 +05:30
Rahul Handay
d08d885828 Adding states/win_dns_client.py unit tests 2015-05-12 22:34:31 +05:30
Rahul Handay
4cde78a58a Adding states/vbox_guest.py unit tests 2015-05-12 22:31:03 +05:30
Nicole Thomas
d2f097584c Merge pull request #23583 from jayeshka/ipset_states-unit-test 
adding states/ipset unit test case
 2015-05-12 10:31:55 -06:00
Nicole Thomas
82a47e8cbf Merge pull request #23582 from jayeshka/keyboard_states-unit-test 
adding states/keyboard unit test case
 2015-05-12 10:31:17 -06:00
Nicole Thomas
77e5b28566 Merge pull request #23581 from jayeshka/layman_states-unit-test 
adding states/layman unit test case
 2015-05-12 10:30:36 -06:00
Nicole Thomas
cbe32828ef Merge pull request #23580 from jayeshka/smf-unit-test 
adding smf unit test case
 2015-05-12 10:29:58 -06:00
Daniel Hobley
30d8be877d Lint fixes 2015-05-12 15:48:53 +02:00
Daniel Hobley
899ba78e79 Added power cfg module and state for windows minions 
- Allows you to set power settings on a windows minion for things like the monitor and disk
 2015-05-12 14:49:48 +02:00
Jayesh Kariya
4f9719157b adding smf unit test case 2015-05-12 18:06:49 +05:30
Jayesh Kariya
297b055b1c adding states/layman unit test case 2015-05-12 18:05:35 +05:30
Jayesh Kariya
fa94d7ab5c adding states/keyboard unit test case 2015-05-12 18:04:26 +05:30
Jayesh Kariya
4330cf4a6e adding states/ipset unit test case 2015-05-12 18:03:14 +05:30
Justin Findlay
6ec87ce9f5 Merge pull request #23551 from dr4Ke/grains.append_unit_tests 
grains.append unit tests, related to #23474
 2015-05-11 15:54:24 -06:00
Colton Myers
9b2f27b87f Remove unused mock_open 2015-05-11 15:52:24 -06:00