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
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
