Commit Graph

692 Commits

Author SHA1 Message Date
Daniel Hobley
1c8e6e067f Fixed lint issues 2015-09-01 13:56:43 +02:00
Daniel Hobley
fc724158de Added the ability to set permanent environment variables on windows 2015-08-31 13:47:29 +02:00
Colton Myers
1bbe45538e Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop
Conflicts:
    salt/cloud/__init__.py
    salt/modules/smartos_vmadm.py
    salt/utils/s3.py
    setup.py
2015-08-28 16:44:08 -06:00
Colton Myers
964a47c643 Fix tests 2015-08-28 13:50:31 -06:00
Colton Myers
9e88672e5a Merge pull request #26683 from basepi/merge-forward-develop
Merge forward from 2015.8 to develop
2015-08-27 15:28:14 -06:00
Colton Myers
5628702dd2 lint 2015-08-27 14:41:31 -06:00
Mike Place
cfc61c6629 Merge pull request #26688 from richardhansen/states.host.only
new salt.states.host.only() function to limit names associated with an IP
2015-08-27 14:23:00 -06:00
Colton Myers
4f441179aa Test fixes 2015-08-27 14:11:34 -06:00
Colton Myers
e9674b541f Another file_test fix 2015-08-27 14:08:14 -06:00
Erik Johnson
96c559d63e tests/unit/states/eselect_test.py: remove raw string formatting 2015-08-26 23:26:08 -05:00
Erik Johnson
2d51f3d25b tests/unit/states/dockerng_test.py: remove raw string formatting 2015-08-26 23:26:08 -05:00
Colton Myers
ca3f40b94e More test fixing 2015-08-26 19:32:31 -06:00
Richard Hansen
7457f2302d salt.states.host.only: new function to limit to specific hostnames 2015-08-26 20:21:45 -04:00
Colton Myers
a9cdb633a4 Fix failing test 2015-08-26 16:08:50 -06:00
Colton Myers
76c70162db Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop
Conflicts:
    doc/conf.py
    doc/topics/spm/index.rst
    salt/cloud/clouds/gce.py
    salt/cloud/clouds/opennebula.py
    salt/cloud/clouds/openstack.py
    tests/unit/states/file_test.py
2015-08-26 14:47:33 -06:00
Colton Myers
ed940ad5f5 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8
Conflicts:
    salt/cloud/clouds/gce.py
    salt/cloud/clouds/openstack.py
    tests/unit/modules/artifactory_test.py
    tests/unit/modules/groupadd_test.py
    tests/unit/modules/jboss7_test.py
    tests/unit/states/jboss7_test.py
2015-08-25 13:55:44 -06:00
Justin Findlay
60087d0861 update unit tests for ini state 2015-08-24 12:08:10 -06:00
Erik Johnson
49d8bd1dbe Remove unused import 2015-08-21 22:54:54 -05:00
Erik Johnson
81a0d4c915 Skip tests that don't work with older mock
This fixes test failures on RHEL6 builds.

This also removes two win_network tests which were clearly made to pass
only in Jenkins, and not in a chrooted build environment.
2015-08-21 21:35:11 -05:00
Ageeleshwar Kandavelu
73bfbab452 Merge from upstream
Merge branch 'develop' of github.com:saltstack/salt into develop
2015-08-21 08:59:43 +05:30
Ageeleshwar Kandavelu
b2ec235199 ini cosmetics fix 2015-08-20 20:05:36 +05:30
Colton Myers
73282d51cc Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop
Conflicts:
    salt/cli/daemons.py
    salt/master.py
    salt/minion.py
    salt/modules/gpg.py
    salt/modules/pw_group.py
    salt/utils/http.py
    setup.py
    tests/unit/modules/schedule_test.py
2015-08-19 11:29:45 -06:00
Colton Myers
f6481a1fb3 Merge pull request #26410 from basepi/merge-forward-2015.8
[2015.8] Merge forward from 2015.5 to 2015.8
2015-08-18 11:52:13 -06:00
Erik Johnson
cc8a5b181e Remove unit tests for git states
These need to be completely rewritten
2015-08-17 22:10:39 -05:00
Colton Myers
d3d0e004d9 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8
Conflicts:
    salt/minion.py
    salt/modules/gpg.py
    salt/modules/keystone.py
    salt/modules/pw_user.py
    salt/states/reg.py
    setup.py
2015-08-17 16:54:16 -06:00
rallytime
211f6feaf5 Fix test failures - get_attributes shouldn't be called if none are provided 2015-08-17 10:58:44 -06:00
Justin Findlay
ee59d154d7 Merge pull request #26293 from jfindlay/reggie
Fix #26268
2015-08-13 13:48:06 -06:00
Justin Findlay
3348b726c9 fix state/reg unit tests 2015-08-13 12:13:02 -06:00
Mike Place
65ab5aa495 Merge pull request #26263 from rallytime/fix-24882
Don't make changes when test=True for openstack present/absent funcs
2015-08-13 10:30:31 -06:00
twangboy
a1274c438d I might have fixed some tests... I might have made them worse 2015-08-12 17:13:50 -06:00
rallytime
86b8161d22 Mock test key in __opts__ dict 2015-08-12 14:29:33 -06:00
Andreas Lutro
1f02e1671b cron: fix a typo in the tests 2015-08-12 10:08:43 +02:00
Andreas Lutro
9b18cd9050 cron: more descriptive tests, updated to reflect new behavior 2015-08-12 10:06:53 +02:00
Colton Myers
1b0b21394e Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop
Conflicts:
    salt/cloud/clouds/vmware.py
    salt/modules/win_system.py
2015-08-10 13:27:31 -06:00
Erik Johnson
56798d724c Fix comment in return value 2015-08-09 22:07:02 -05:00
Erik Johnson
18ebdd382a Update winrepo tests with new param names 2015-08-09 21:19:45 -05:00
Thomas S Hatch
2ddf5c4e58 lint 2015-08-08 20:17:45 -06:00
Thomas S Hatch
912d6041f5 apply @cachedout's tests 2015-08-08 09:37:16 -06:00
Thomas S Hatch
0e705d2185 add pchanges docs 2015-08-08 09:32:29 -06:00
Colton Myers
d332d54eec Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 2015-08-05 15:32:11 -06:00
Mike Place
85f5e2a443 Fix failing tests 2015-08-04 09:48:43 -06:00
Colton Myers
d5fbd960fe Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop
Conflicts:
    salt/cloud/clouds/vmware.py
    salt/fileserver/s3fs.py
    salt/modules/chocolatey.py
    salt/modules/s3.py
    salt/modules/zpool.py
    salt/pillar/s3.py
    salt/utils/s3.py
    tests/unit/modules/s3_test.py
2015-08-03 15:01:35 -06:00
Colton Myers
e29be766bb Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8
Conflicts:
    debian/changelog
    doc/man/salt.7
    salt/cloud/__init__.py
    salt/cloud/clouds/proxmox.py
    salt/cloud/clouds/vmware.py
    salt/config.py
    salt/fileclient.py
    salt/minion.py
    salt/modules/chocolatey.py
    salt/modules/localemod.py
    salt/modules/pacman.py
    salt/modules/pkgng.py
    salt/modules/schedule.py
    salt/modules/state.py
    salt/modules/win_file.py
    salt/modules/win_pkg.py
    salt/state.py
    salt/states/file.py
    salt/utils/args.py
    tests/unit/states/file_test.py
2015-07-30 16:54:44 -06:00
Mike Place
ada3a29e55 Fix broken test for file.copy 2015-07-28 09:57:49 -06:00
Thomas S Hatch
1fae76d53c Merge pull request #25685 from twangboy/fix_25594
Fixed regex issues with comment and uncomment
2015-07-28 09:29:49 -06:00
twangboy
a904e8329b Fixed another test failure... 2015-07-27 15:05:23 -06:00
Pedro Algarvio
1010eef5ff Merge remote-tracking branch 'upstream/2015.8' into develop 2015-07-27 18:20:50 +01:00
twangboy
aa077d3a86 Fixed more tests... justin findlay helped me... 2015-07-27 11:18:25 -06:00
Justin Findlay
3b0cc6592a fix reg unit tests 2015-07-27 10:57:05 -06:00
twangboy
87c8f8dfb5 Fixed some tests... maybe... 2015-07-24 15:07:45 -06:00
twangboy
b473fb7827 Fixed some tests... maybe... 2015-07-24 09:40:46 -06:00
Arthur Lutz
555d7b867f pylint fixes 2015-07-23 09:02:44 +02:00
Arthur Lutz
5607957828 [states/postgresql_cluster] pylint fixes 2015-07-23 08:20:26 +02:00
Mike Place
6f65fbdb82 Fix test 2015-07-22 11:43:19 -06:00
Arthur Lutz
5f727fe8b2 [states] postgresql_cluster support (backed by the postgresql cluster modules)
developped with David Douard <david.douard@logilab.fr> @douardda

closes #21293
2015-07-22 17:39:08 +02:00
Justin Findlay
704b68b3f4 Merge pull request #25494 from s0undt3ch/develop
Merge 2015.8 forward to develop
2015-07-16 22:55:06 -06:00
Pedro Algarvio
f8ee8c1ba9 Merge remote-tracking branch 'upstream/2015.8' into develop 2015-07-16 20:08:28 +01:00
Bo Maryniuk
d55633b796 Fix tests for the virt state 2015-07-15 13:09:11 +02:00
Colton Myers
2a144b954a Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8
Conflicts:
    doc/ref/states/requisites.rst
    doc/topics/tutorials/states_pt5.rst
    salt/cloud/clouds/ec2.py
    salt/config.py
    salt/minion.py
    salt/modules/cp.py
    salt/pillar/__init__.py
    salt/states/file.py
2015-07-14 10:57:36 -06:00
Thomas S Hatch
9b6646d578 Merge pull request #25269 from jfindlay/tomcat
Extract tomcat war version
2015-07-09 19:28:21 -06:00
Justin Findlay
59dc833567 update tomcat war_deployed state tests 2015-07-08 15:39:52 -06:00
Erik Johnson
bd46c875ea Merge pull request #25162 from ticosax/dockerng-fix-pull-force
[dockerng] Do not call inspect_image if we know the image is not downloaded
2015-07-06 10:18:16 -05:00
Mike Place
a67156e34f Fix tests for #25115 2015-07-06 08:54:45 -06:00
Nicolas Delaby
48f20b9739 Do not call inspect_image if we know the image is not downloaded 2015-07-06 14:01:25 +02:00
Colton Myers
24d51fb8f1 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8
Conflicts:
    doc/ref/configuration/minion.rst
    salt/config.py
    salt/modules/sudo.py
    tests/integration/states/file.py
2015-07-02 09:46:36 -06:00
Justin Findlay
071ee44d41 Revert "Revert "adding states/postgres_database unit test case."" 2015-07-01 09:47:08 -06:00
Justin Findlay
bf8c7e7a9d Merge pull request #24362 from jayeshka/postgres_user-states-unit-test
adding states/postgres_user unit test case.
2015-07-01 15:45:31 -06:00
Justin Findlay
4195cea512 Merge pull request #24361 from jayeshka/postgres_schema-states-unit-test
adding states/postgres_schema unit test case.
2015-07-01 15:44:56 -06:00
Justin Findlay
ada8fe57d4 Merge pull request #24331 from jayeshka/postgres_extension-states-unit-test
adding states/postgres_extension unit test case.
2015-07-01 15:43:58 -06:00
Justin Anderson
21709aa483 Merge pull request #25096 from jfindlay/postgres_group_test
Postgres group test
2015-07-01 12:48:25 -06:00
Justin Findlay
3c379dc115 declobber postgres state unit test mocking 2015-07-01 12:01:50 -06:00
Justin Findlay
937a252e16 remove unnecessary file state tests 2015-06-30 17:16:17 -06:00
Colton Myers
99fc7ecb4b Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop
Conflicts:
    doc/man/salt-call.1
    doc/man/salt-cloud.1
    doc/man/salt-cp.1
    doc/man/salt.7
    salt/cloud/__init__.py
    salt/fileclient.py
    salt/modules/file.py
    salt/modules/gpg.py
2015-06-29 16:49:40 -06:00
Mike Place
db9d61251b Lint 2015-06-29 16:16:11 -06:00
Mike Place
afbe54e677 Reset grains opts on each test 2015-06-29 16:15:41 -06:00
Mike Place
96a6e446da Try another way to fix grains test 2015-06-29 10:42:13 -06:00
Jayesh Kariya
bb0a6d5625 adding states/supervisord unit test case. 2015-06-26 13:06:53 +05:30
Colton Myers
f65e663353 Merge pull request #24937 from basepi/merge-forward-develop
Merge forward from 2015.5 to develop
2015-06-25 16:03:47 -06:00
Mike Place
d48af16594 Set grains test to local 2015-06-25 15:30:16 -06:00
Colton Myers
63667e0d49 Add more side effects 2015-06-25 14:08:47 -06:00
Colton Myers
880760f813 Fix ssh_auth test 2015-06-25 11:17:00 -06:00
Colton Myers
acb7c6f52b Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop
Conflicts:
    salt/minion.py
    salt/modules/network.py
    salt/utils/cloud.py
    salt/utils/job.py
2015-06-24 11:44:04 -06:00
Mike Place
e1069741ea Fix grains test 2015-06-24 10:46:40 -06:00
Justin Findlay
90819f9c37 Merge pull request #24923 from jayeshka/status-states-unit-test
adding states/status unit test case.
2015-06-24 09:50:07 -06:00
Jayesh Kariya
baec650674 adding states/status unit test case. 2015-06-24 17:23:13 +05:30
Jayesh Kariya
ef1347f2b3 adding states/ssh_known_hosts unit test case. 2015-06-23 15:53:46 +05:30
Jayesh Kariya
e5d7b0de80 adding states/ssh_auth unit test case. 2015-06-22 17:29:08 +05:30
rallytime
a306216ab9 Merge branch '2015.5' into merge_forward_develop 2015-06-19 16:37:56 -06:00
Christophe Drevet-Droguet
ed4d0646a4 unit tests for state grains: use a subdirectory for config file
This way, there is no /tmp/grains created on test execution. And the issue
with test_absent_delete is always triggered.
Maybe we should use mocked files, but I'm not sure how to do it.
2015-06-19 12:49:48 +02:00
Christophe Drevet-Droguet
ff5267b1b6 trying to fix jenkins error
There are many jenkins errors on linode CentOS7. The function `saltutil.sync_grains`
does not seem to be mocked correctly on this platform.

Based on 1f5836d0bb
2015-06-19 12:49:28 +02:00
Jayesh Kariya
98831a8cb0 adding states/splunk_search unit test case. 2015-06-19 15:15:49 +05:30
Christophe Drevet-Droguet
650fa90b97 more complete unit tests for state grains 2015-06-19 09:20:23 +02:00
Colton Myers
ae05e70e94 Merge pull request #24802 from basepi/merge-forward-2015.5
[2015.5] Merge forward from 2014.7 to 2015.5
2015-06-18 14:11:58 -06:00
twangboy
98e7e90299 Fixed test failures for Colton 2015-06-18 12:58:18 -06:00
Colton Myers
a5c9681672 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop
Conflicts:
    doc/topics/releases/version_numbers.rst
    salt/cli/batch.py
    salt/minion.py
    salt/state.py
    setup.py
2015-06-18 11:43:11 -06:00
Justin Anderson
179ce03d93 Revert "adding states/postgres_database unit test case." 2015-06-18 10:24:11 -06:00
Jayesh Kariya
e2b6214764 adding states/slack unit test case. 2015-06-18 15:47:27 +05:30
Mike Place
a407ab7c51 Merge pull request #24329 from jayeshka/postgres_database-states-unit-test
adding states/postgres_database unit test case.
2015-06-17 13:11:02 -06:00
Jayesh Kariya
1a4c241050 adding states/serverdensity_device unit test case. 2015-06-17 16:50:40 +05:30
Colton Myers
2ae0d7d302 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop
Conflicts:
    salt/modules/win_file.py
2015-06-16 15:13:53 -06:00
Justin Findlay
1753234bab Merge pull request #24615 from msteed/py3-unittests-5
py3 unittest compat
2015-06-16 09:25:19 -06:00
Jayesh Kariya
0c136fd9c2 adding states/selinux unit test case. 2015-06-16 17:11:44 +05:30
Jayesh Kariya
54aaaa5f12 adding states/schedule unit test case. 2015-06-15 17:16:21 +05:30
Colton Myers
5b49e89b43 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop 2015-06-12 11:42:42 -06:00
Jayesh Kariya
af1bd8f9ff adding states/reg unit test case. 2015-06-12 17:23:41 +05:30
Michael Steed
5eb097e584 py3: fix tests/unit/states/cron_test.py 2015-06-11 16:26:10 -06:00
Michael Steed
e7620a2c30 py3: fix tests/unit/states/modjk_test.py 2015-06-11 15:16:17 -06:00
Colton Myers
725e5c689f Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop 2015-06-11 13:15:38 -06:00
Jayesh Kariya
3b95744840 adding states/redismod unit test case. 2015-06-11 17:42:15 +05:30
Jayesh Kariya
273b994e91 adding states/rdp unit test case. 2015-06-10 18:41:29 +05:30
Colton Myers
94d6ef1d17 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop
Conflicts:
    doc/ref/modules/all/salt.modules.ipmi.rst
    doc/ref/states/all/salt.states.tls.rst
    doc/topics/cloud/index.rst
    doc/topics/cloud/vsphere.rst
    doc/topics/eauth/index.rst
    salt/cli/batch.py
    salt/modules/cmdmod.py
    salt/modules/ipmi.py
    salt/netapi/rest_cherrypy/app.py
    salt/runners/http.py
    salt/states/boto_elb.py
    salt/states/dockerio.py
    salt/states/linux_acl.py
    salt/states/win_servermanager.py
    salt/wheel/config.py
2015-06-09 11:41:07 -06:00
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