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
jfindlay
4afaccf6b1
Merge pull request #20482 from basepi/merge-forward-develop
...
Merge forward from 2015.2 to develop
2015-02-06 16:59:27 -07:00
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
jfindlay
c75ec867ff
Merge pull request #20477 from rallytime/pylint
...
Pylint fix for develop
2015-02-06 15:39:53 -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
rallytime
dd413f495d
Move integration import after ensure_in_syspath call
2015-02-06 12:49:28 -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
a34770b582
Merge pull request #20461 from cachedout/environ_isolate
...
Reset env at end of test
2015-02-06 10:15:19 -07:00
Mike Place
7dd8aef5b4
Typo
2015-02-06 10:46:31 -07:00
rallytime
e256943fd6
Pylint fix for develop
2015-02-06 10:04:52 -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
Mike Place
5a90fcfd45
Use cls attr
2015-02-06 09:47:26 -07:00
Mike Place
8459819663
Reset env at end of test
2015-02-06 08:40:50 -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
eaa879a64e
Python 3 compat for tests/integration/loader/globals.py
2015-02-06 07:48:20 -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
rallytime
385792727b
Moved tests/unit/loader.py to tests/integration/loader/loader.py
...
These are integration tests and not unit tests, so they should be
in the proper directory.
Also, fixed up the python 3 incompatability pylint errors.
2015-02-06 07:28:43 -07:00
Mike Place
640b66238c
Merge pull request #20274 from jacksontj/loader
...
Loader overhaul to LazyLoader
2015-02-05 15:50:19 -07:00
Thomas S Hatch
6683046c0b
Merge pull request #20375 from rupeshta/mine_unit_tests
...
Mine unit tests
2015-02-05 14:01:12 -07:00
Thomas Jackson
f01a5c5fbd
Pylint
2015-02-05 12:17:48 -08: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
Joseph Hall
4932cf6596
Merge pull request #20414 from borgstrom/pyobjects-import-as
...
Update documentation & tests following #18911
2015-02-05 12:02:17 -07:00
Thomas Jackson
b762c72a2a
Add test for __func__alias__
2015-02-05 09:20:30 -08:00
Thomas Jackson
87d90bf980
More loader tests
...
As well as an optimization on clear()
2015-02-05 09:20:30 -08:00
Thomas Jackson
f2dea6a5e9
Add loader tests
2015-02-05 09:20:30 -08:00
Thomas Jackson
307e5c1473
Check that __context__ is always present, since it now is (properly)
2015-02-05 09:20:30 -08:00
Thomas Jackson
686ec05b84
Remove test as well
...
Conflicts:
tests/unit/output/grains.py
2015-02-05 09:20:29 -08:00
Thomas Jackson
b23a076e11
Remove grains outputter
...
Its been broken for ~8 months (or more), and its been falling back to nested. Since nested does (IMO) a better job displaying the data and is generic, there is no reason to get this working-- esp since we've already "deprecated" it, by it not working
Conflicts:
salt/output/grains.py
2015-02-05 09:20:29 -08:00
Thomas Jackson
509b4352f2
Pack modules to runners
2015-02-05 09:20:27 -08:00
rallytime
c25e88b9e1
Don't forget the pylint ignore
2015-02-05 08:06:18 -07:00
Evan Borgstrom
a43920bffc
Update documentation & tests following #18911
...
Thanks for the contribution @tomashavlas! Please make sure you update
the tests & documentation in the future.
2015-02-04 21:27:24 -08:00
rallytime
02d3235cf2
Fix remaining pylint errors on develop
2015-02-04 21:11:17 -07:00
Justin Findlay
7c943ec8a7
only add successfully generated ssh keys to config
2015-02-04 16:16:41 -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
