Commit Graph

1805 Commits

Author SHA1 Message Date
Alexander Schwartz
c05aae9ce7 added archive test script 2015-02-09 14:52:46 +00: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
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
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
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
686ec05b84 Remove test as well
Conflicts:

	tests/unit/output/grains.py
2015-02-05 09:20:29 -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
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