Mike Place
b4bd491f8e
Merge pull request #20981 from makinacorpus/psql
...
postgres: role update support
2015-02-25 09:35:15 -07:00
Mike Place
dd17969b7b
Merge pull request #21018 from jayeshka/win_ntp-unit-test
...
adding win_ntp unit test case
2015-02-25 09:19:37 -07:00
Jayesh Kariya
d7a0ca956d
adding win_shadow unit test case
2015-02-25 18:48:05 +05:30
Jayesh Kariya
5e851b3789
adding win_ntp unit test case
2015-02-25 18:46:45 +05:30
Mathieu Le Marec - Pasquet
126e29c3eb
pgsql: fix tests
2015-02-24 21:01:13 +01:00
Jayesh Kariya
d5b70b5fea
adding win_firewall unit test case
2015-02-24 18:58:55 +05:30
jfindlay
a38c17efde
Merge pull request #20901 from aspyatkin/feature-bower
...
Add Bower execution and state modules
2015-02-23 21:40:10 -07:00
Colton Myers
c8eb2d4665
Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop
...
Conflicts:
doc/topics/installation/windows.rst
salt/cloud/clouds/joyent.py
salt/daemons/flo/core.py
salt/minion.py
2015-02-23 14:25:51 -07:00
rallytime
0e57d8fe6e
Fix pylint errors on develop
2015-02-23 12:24:53 -07:00
rallytime
c0cad91549
Fix unit test
2015-02-21 19:29:57 -07:00
Pedro Algarvio
c85d38c493
Merge pull request #20893 from cvrebert/pylint-enable
...
re-enable pylint instead of disabling it twice
2015-02-21 08:29:16 +00:00
Chris Rebert
ea02ef58b7
re-enable pylint instead of disabling it twice
2015-02-20 23:50:30 -08:00
Alexander Pyatkin
c408c935a0
Implement Bower execution module
2015-02-21 05:56:20 +00:00
Chris Rebert
2a52d54a20
Avoid shadowing list type in modules.darwin_pkgutil; fixes #20120
2015-02-20 21:52:25 -08:00
Jayesh Kariya
014ce111ab
adding win_autoruns unit test case
2015-02-20 19:16:09 +05:30
jfindlay
b70ffe2bb8
Merge pull request #20819 from jayeshka/slack_notify-unit-test
...
adding slack_notify unit test case
2015-02-19 08:21:30 -07:00
Jayesh Kariya
93d5a32bd8
adding rpm unit test case
2015-02-19 14:40:10 +05:30
Jayesh Kariya
6efb71fb6e
adding slack_notify unit test case
2015-02-19 14:38:51 +05:30
Nicole Thomas
e190909055
Merge pull request #20755 from jayeshka/modjk-unit-test
...
adding modjk unit test case
2015-02-17 08:38:47 -07:00
jfindlay
0c6b89e81c
Merge pull request #20756 from jayeshka/npm-unit-test
...
adding npm unit test case
2015-02-17 08:38:26 -07:00
Nicole Thomas
c398669a6e
Merge pull request #20754 from jayeshka/swift-unit-test
...
adding swift unit test case
2015-02-17 08:37:51 -07:00
Nicole Thomas
87b019bc8c
Merge pull request #20753 from jayeshka/sdb-unit-test
...
adding sdb unit test case
2015-02-17 08:36:52 -07:00
jfindlay
d1068f5c14
Merge pull request #20752 from jayeshka/ret-unit-test
...
adding ret unit test case
2015-02-17 08:36:42 -07:00
jfindlay
1a5c187945
Merge pull request #20751 from jayeshka/openstack_config-unit-test
...
adding openstack_config unit test case
2015-02-17 08:35:42 -07:00
Jayesh Kariya
35a25e1ad6
adding sdb unit test case
2015-02-17 18:20:58 +05:30
Jayesh Kariya
f38fe3a34e
adding ret unit test case
2015-02-17 18:19:04 +05:30
Jayesh Kariya
0e3a86f84b
adding openstack_config unit test case
2015-02-17 18:17:10 +05:30
Jayesh Kariya
b25fc47126
adding npm unit test case
2015-02-17 18:14:15 +05:30
Jayesh Kariya
17796ca5b4
adding modjk unit test case
2015-02-17 18:12:01 +05:30
Jayesh Kariya
5098a63fd1
adding swift unit test case
2015-02-17 18:09:33 +05:30
Dennis Hall
478f42d9b2
Change Github to GitHub
2015-02-15 15:19:54 +01:00
rallytime
1f7d257767
Add some python 3 compatibility fixes for new test files
2015-02-13 11:30:45 -07:00
Nicole Thomas
47ac489d0e
Merge pull request #20676 from jayeshka/rest_sample-unit-test
...
rest_sample unit test case
2015-02-13 08:48:21 -07:00
jfindlay
9328406c80
Merge pull request #20675 from jayeshka/neutron-unit-test
...
adding neutron unit test case
2015-02-13 08:46:39 -07:00
Jayesh Kariya
a988606cf5
adding neutron unit test case
2015-02-13 17:06:08 +05:30
Jayesh Kariya
1e7f2e7dbd
rest_sample unit test case
2015-02-13 17:04:52 +05:30
Jayesh Kariya
dd72026be9
adding rdp unit test case
2015-02-13 17:03:26 +05:30
Tarjei Husøy
5e05fd717a
Quote iptables args with leading/trailing spaces
2015-02-12 16:35:33 +01:00
Tarjei Husøy
9f6dfb5a04
Remove lots of string concatenation in iptables module
2015-02-11 23:25:45 +01:00
Tarjei Husøy
943be9f0b3
Remove a lot of duplication in iptables module
2015-02-11 23:24:07 +01:00
Tarjei Husøy
9afc8fca8a
Add support for iptables --log-* arguments
2015-02-11 23:24:06 +01:00
Tarjei Husøy
aeb91b000c
Refactor after_jump handling in iptaples module
2015-02-11 23:23:20 +01:00
jfindlay
a572be2ca3
Merge pull request #20594 from basepi/merge-forward-develop
...
Merge forward from 2015.2 to develop
2015-02-11 11:40:15 -07:00
Justin Findlay
657b79912e
fix iptables unit tests for merge forward
2015-02-11 10:52:07 -07:00
Mike Place
5db9172884
Lint btrfs test
2015-02-10 19:09:30 -07:00
Mike Place
679d704029
Merge pull request #20514 from jayeshka/btrfs-unit-test
...
adding btrfs unit test case
2015-02-10 14:32:44 -07:00
rallytime
66cb14cea5
Fix python 3 compat errors that were inadvertently reverted
2015-02-10 09:07:09 -07:00
Mike Place
f8aeef25fc
Fix mod_random test on older distros
2015-02-10 08:46:42 -07:00
Jayesh Kariya
511a496946
resolved the error
2015-02-10 11:28:01 +05:30
Nicole Thomas
a0d5c3dc79
Revert "More python 3 compatibility changes"
2015-02-09 19:57:38 -07:00
rallytime
3aa934abb4
Python 3 compat for haproxyconn_test.py
2015-02-09 17:14:04 -07:00
rallytime
bcafb5777f
Python 3 compat for osxdesktop_test.py
2015-02-09 17:13:09 -07:00
rallytime
a162e6b443
Fix influx_test mocking
2015-02-09 11:55:54 -07:00
jfindlay
fea95c0866
Merge pull request #20517 from rupeshta/nagios_unit_tests
...
implemented unit test cases for nagios module
2015-02-09 08:28:24 -07:00
jfindlay
23494674a8
Merge pull request #20516 from jayeshka/haproxyconn-unit-test
...
adding haproxyconn unit test case
2015-02-09 08:26:47 -07:00
Rupesh Tare
264b63b9df
implemented unit test cases for nagios module
2015-02-09 19:49:14 +05:30
Jayesh Kariya
d6101705b9
adding osxdesktop unit test case
2015-02-09 18:24:45 +05:30
Jayesh Kariya
d72afef3dd
adding haproxyconn unit test case
2015-02-09 18:23:22 +05:30
Jayesh Kariya
16503cba43
adding btrfs unit test case
2015-02-09 18:21:03 +05:30
Colton Myers
244c916b10
Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop
...
Conflicts:
salt/modules/cron.py
salt/states/npm.py
2015-02-06 15:41:21 -07:00
Colton Myers
56520f4ac9
Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2
...
Conflicts:
conf/minion
salt/modules/cron.py
salt/modules/pip.py
salt/modules/tls.py
2015-02-06 13:00:14 -07:00
Justin Findlay
b59a164717
fix merge forward localemod tests
2015-02-06 12:21:13 -07:00
Colton Myers
06e1a4f519
Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop2
...
Conflicts:
salt/client/mixins.py
salt/loader.py
salt/modules/localemod.py
salt/modules/pillar.py
salt/netapi/rest_cherrypy/app.py
salt/pillar/__init__.py
salt/states/mount.py
salt/states/ssh_auth.py
2015-02-06 12:09:01 -07:00
Mike Place
0971e87782
Merge pull request #20455 from rupeshta/mod_random_unit_tests
...
Mod random unit tests
2015-02-06 09:49:45 -07:00
Mike Place
881a42a417
Merge pull request #20456 from rupeshta/monit_unit_tests
...
Monit unit tests
2015-02-06 09:48:56 -07:00
rallytime
db612d0b81
Clean up some pylint on 2015.2
...
This way PRs against 2015.2 will be a little happier
2015-02-06 07:58:26 -07:00
rallytime
135ee5aafe
Python 3 compat for mine_test.py and other testing import needs
2015-02-06 07:46:47 -07:00
Rupesh Tare
7b79128309
added some imports
2015-02-06 20:09:45 +05:30
Rupesh Tare
6e0134ff92
added some imports
2015-02-06 20:07:43 +05:30
Rupesh Tare
3484419377
implementd unit test cases for monit module
2015-02-06 20:05:41 +05:30
Rupesh Tare
4c19fb6632
implementd unit test cases for mod_random module
2015-02-06 20:00:44 +05:30
Thomas S Hatch
6683046c0b
Merge pull request #20375 from rupeshta/mine_unit_tests
...
Mine unit tests
2015-02-05 14:01:12 -07:00
Justin Findlay
a44368001b
fix pip venv regression, deprecate activate param
...
Fixes #20191 . If `bin_env` points to a virtualenv, there is no need to
activate that virtualenv for pip to install into the virtualenv. Also
update associated unit test.
2015-02-05 12:36:42 -07:00
Joseph Hall
7da1181899
Merge pull request #20367 from robmessick/gem_list_upgrades
...
Add list_upgrades method to salt.modules.gem
2015-02-05 12:07:09 -07:00
rallytime
c25e88b9e1
Don't forget the pylint ignore
2015-02-05 08:06:18 -07:00
rallytime
02d3235cf2
Fix remaining pylint errors on develop
2015-02-04 21:11:17 -07:00
rallytime
e882a6dec4
Merge #20374 with some fixes
2015-02-04 08:52:33 -07:00
Rupesh Tare
236f1adfc2
implemented unit test cases for mine module
2015-02-04 18:36:12 +05:30
Rupesh Tare
535247d805
implemented unit test cases for match module
2015-02-04 18:33:35 +05:30
Rupesh Tare
a1efeb59be
implemented unit test cases for lvs module
2015-02-04 18:30:44 +05:30
Pedro Algarvio
62e9407903
Merge pull request #20349 from rallytime/develop_pylint
...
Develop pylint
2015-02-04 11:58:39 +00:00
Rob Messick
4a042114ee
Add method list_upgrades (modeled on the salt.modules.pip). Calls 'gem outdated' and returns a dictionary containing gem names and the version number of the latest gem.
2015-02-03 20:39:29 -08:00
Colton Myers
44bd4fb906
Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2
...
Conflicts:
salt/cli/__init__.py
2015-02-03 13:26:11 -07:00
Justin Findlay
334245170a
add mocks to fix test when iptables cmd is absent
2015-02-03 13:22:22 -07:00
rallytime
2f9dc14af1
More Python 3 compat changes to new test modules
2015-02-03 11:40:27 -07:00
rallytime
244ba09cfc
Python 3 compat for several new test files
2015-02-03 11:34:49 -07:00
Justin Findlay
8eab04bd69
fix linux_sysctl_test failures caused by #20314
2015-02-03 11:30:27 -07:00
rallytime
d2d42e522f
Python 3 compat and additions to ldapmod_test
2015-02-03 11:28:03 -07:00
rallytime
19680fc6a4
Make sure all exits are blocked and mocked
2015-02-03 10:28:29 -07:00
Thomas S Hatch
20bbd01bc8
Merge pull request #20331 from jayeshka/etcd_mod-unit-test
...
adding etcd_mod unit test case
2015-02-03 06:19:43 -07:00
Thomas S Hatch
46b3a24947
Merge pull request #20330 from jayeshka/memcached-unit-test
...
adding memcached unit test case
2015-02-03 06:19:33 -07:00
Thomas S Hatch
9fe7c36964
Merge pull request #20327 from jayeshka/ldapmod-unit-test
...
adding ldapmod unit test case
2015-02-03 06:18:40 -07:00
Thomas S Hatch
3e6370c6e5
Merge pull request #20326 from jayeshka/munin-unit-test
...
adding munin unit test
2015-02-03 06:18:20 -07:00
Thomas S Hatch
0aed9b3704
Merge pull request #20325 from jayeshka/moosefs-unit-test
...
adding moosefs unit test
2015-02-03 06:17:27 -07:00
Thomas S Hatch
06d314b8bc
Merge pull request #20324 from jayeshka/logrotate-unit-test
...
adding logrotate unit test
2015-02-03 06:17:08 -07:00
Thomas S Hatch
78a613a3a6
Merge pull request #20321 from jayeshka/keyboard-unit-test
...
adding keyboard unit test case
2015-02-03 06:13:56 -07:00
Thomas S Hatch
82d6677e12
Merge pull request #20294 from jayeshka/introspect-unit-test
...
adding introspect unit test case
2015-02-03 06:12:38 -07:00
Thomas S Hatch
ff1312e1db
Merge pull request #20320 from jayeshka/locate-unit-test
...
adding locate unit test case
2015-02-03 06:11:28 -07:00
Jayesh Kariya
d91b36a8fc
adding etcd_mod unit test case
2015-02-03 16:59:26 +05:30
Jayesh Kariya
697099c469
adding memcached unit test case
2015-02-03 16:57:53 +05:30
Jayesh Kariya
f9d43f5adc
resolved pylint errors
2015-02-03 14:41:32 +05:30
Jayesh Kariya
b1bf62ae74
adding ldapmod unit test case
2015-02-03 14:18:42 +05:30
Jayesh Kariya
8745225574
adding munin unit test
2015-02-03 14:17:14 +05:30
Jayesh Kariya
24c9004023
adding moosefs unit test
2015-02-03 14:00:22 +05:30
Jayesh Kariya
ec88812ed9
adding logrotate unit test
2015-02-03 13:59:01 +05:30
Jayesh Kariya
d1b4fce53e
removed pylint error
2015-02-03 13:34:01 +05:30
Jayesh Kariya
3ad563df91
adding locate unit test case
2015-02-03 12:06:11 +05:30
Jayesh Kariya
9d2dd056a6
adding keyboard unit test case
2015-02-03 12:04:47 +05:30
Jayesh Kariya
1ae01547e3
adding iptables unit test case
2015-02-03 12:02:56 +05:30
Nicole Thomas
4b94cfb4dc
Merge pull request #20269 from rallytime/refactor_localemod_tests
...
Fix broken localemod_test on develop
2015-02-02 12:56:56 -07:00
rallytime
a99b030e36
Mock salt.utils.which call
2015-02-02 11:55:11 -07:00
Jayesh Kariya
f021c43e97
adding introspect unit test case
2015-02-02 19:17:24 +05:30
rallytime
3dbe1b30d6
Fix broken localemod_test on develop
...
- Fixed failing gen_locale test
- Refactor test to match refactored gen_locale function
- Break out gen_locale tests into inividual unit tests
2015-01-30 17:23:32 -07:00
Pedro Algarvio
cc064fdc4a
Py3 compatibility
2015-01-30 23:37:36 +00:00
Pedro Algarvio
0bc66403b9
Py3 compatibility
2015-01-30 23:37:00 +00:00
Pedro Algarvio
44e255f489
Py3 compatibility
2015-01-30 23:36:34 +00:00
Pedro Algarvio
4443cba9ed
Py3 compatibility
2015-01-30 23:36:15 +00:00
Pedro Algarvio
04db610033
Py3 compatibility
2015-01-30 23:35:22 +00:00
Pedro Algarvio
29b519fe88
Py3 compatibility
2015-01-30 22:27:16 +00:00
Pedro Algarvio
a983495a26
Py3 compatibility
2015-01-30 22:27:16 +00:00
Pedro Algarvio
98a61ff6d7
Py3 compatibility
2015-01-30 22:27:16 +00:00
Pedro Algarvio
6030335844
Py3 compatibility
2015-01-30 22:27:16 +00:00
Pedro Algarvio
92d321b732
Py3 compatibility
2015-01-30 22:27:15 +00:00
Pedro Algarvio
95ef4fd9a1
Py3 compatibility
2015-01-30 22:27:15 +00:00
Pedro Algarvio
1c8490bcf9
Py3 compatibility
2015-01-30 22:27:15 +00:00
Pedro Algarvio
da39293b8b
Py3 compatibility
2015-01-30 22:27:14 +00:00
Pedro Algarvio
5c8e966b92
Py3 compatibility
2015-01-30 22:27:14 +00:00
Pedro Algarvio
51c2823168
Py3 compatibility
2015-01-30 22:27:13 +00:00
Pedro Algarvio
c1215a27a8
Py3 compatibility
2015-01-30 22:27:13 +00:00
Pedro Algarvio
ccf0cdacc8
Py3 compatibility
2015-01-30 22:27:13 +00:00
Pedro Algarvio
fd7452b405
Py3 compatibility
2015-01-30 22:27:13 +00:00
Pedro Algarvio
ddad0bc18c
Py3 compatibility
2015-01-30 22:27:13 +00:00
Pedro Algarvio
4324550e55
Py3 compatibility
2015-01-30 22:27:13 +00:00
Pedro Algarvio
0edc28b743
Py3 compatibility and proper assert
2015-01-30 22:27:13 +00:00
Pedro Algarvio
42ec407084
Py3 compatibility
2015-01-30 22:27:13 +00:00
Pedro Algarvio
7668c956cc
Py3 compatibility
2015-01-30 22:27:13 +00:00
Pedro Algarvio
c5ea080c28
Py3 compatibility
2015-01-30 22:27:12 +00:00
Pedro Algarvio
74801c80db
Py3 compatibility
2015-01-30 22:27:12 +00:00
Pedro Algarvio
582d21bc67
Py3 compatibility
2015-01-30 22:27:12 +00:00
Pedro Algarvio
a262f5e960
Py3 compatibility
2015-01-30 22:27:11 +00:00
Pedro Algarvio
49878a997c
Py3 compatibility
2015-01-30 22:27:11 +00:00
Pedro Algarvio
a124936afc
Py3 compatibility
2015-01-30 22:27:11 +00:00
Pedro Algarvio
26337ad676
Py3 compatibility
2015-01-30 22:27:11 +00:00
Pedro Algarvio
822cc12dc8
Py3 compatibility
2015-01-30 22:27:11 +00:00
Pedro Algarvio
cedf7f07fb
Py3 compatibility
2015-01-30 22:27:11 +00:00
Pedro Algarvio
4be7c0e190
Py3 compatibility
2015-01-30 22:27:11 +00:00
Pedro Algarvio
60f556d1bf
Py3 compatibility
2015-01-30 22:27:11 +00:00
Pedro Algarvio
20e6ccd8d0
Py3 compatibility
2015-01-30 22:27:10 +00:00
Pedro Algarvio
43f4a9b8e1
Py3 compatibility
2015-01-30 22:27:10 +00:00
Pedro Algarvio
db20280f73
Py3 compatibility
2015-01-30 22:27:10 +00:00
