valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 09:23:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
50,313 Commits 24 Branches 182 Tags 341 MiB
2ef39ed380
Commit Graph

4425 Commits

Author SHA1 Message Date
Justin Findlay
a6b86ef627 indent quoted code in cmdmod tests 2015-03-02 16:08:49 -07:00
C. R. Oldham
f171df4311 Merge forward 2015.2->develop 2015-03-01 19:54:22 -07:00
C. R. Oldham
00942f2060 Merge forward 2014.7->2015.2 2015-03-01 17:55:25 -07:00
Erik Johnson
94d55889d7 Resolve merge conflicts 2015-02-28 12:35:25 -06:00
Erik Johnson
5573b18624 Fix more py3-incompatible print statements 2015-02-28 12:15:16 -06:00
Erik Johnson
93e1805c14 Lint fix 2015-02-28 12:13:41 -06:00
Erik Johnson
84de5b23af Merge pull request #21160 from terminalmage/lint-2015.2 
Don't use print statement without parenthesis (py3 compat)
 2015-02-28 11:49:13 -06:00
Erik Johnson
afb8439c1f update test_valid_docs 2015-02-28 11:47:12 -06:00
Erik Johnson
86937eedc4 Don't use print statement without parenthesis (py3 compat) 
This backports a lint fix from #21158 into the tests for 2015.2.
 2015-02-28 11:41:51 -06:00
C. R. Oldham
1ff3192c20 Fileserver lists return lists 2015-02-27 17:24:25 -07:00
Justin Findlay
17b8f73f1b add cmd module integration tests 2015-02-27 16:30:05 -07:00
Justin Findlay
3397dc5540 fix state request tests 2015-02-27 16:15:26 -07:00
rallytime
b01196e7e8 Add transport key to mocked opts to fix batch unit tests 2015-02-27 14:53:58 -07:00
Mike Place
14592ed1f9 Adjust batch test 2015-02-27 14:53:58 -07:00
rallytime
eceadb82b1 Move tearDown functionality into test_instance 
The new functions don't need to perform the tearDown behavior,
so that insurance should just be moved the function that needs it.
 2015-02-27 14:53:54 -07:00
rallytime
14f4d28cd6 Add some more tests to catch API changes for digital ocean 2015-02-27 14:53:54 -07:00
Justin Findlay
68f06aae51 add integration test for #18317 2015-02-27 14:53:53 -07:00
Justin Findlay
3b7ba92089 adding cmd.run integration tests 2015-02-27 14:53:53 -07:00
Nicole Thomas
c2ca579906 Merge pull request #20965 from rallytime/joyent_cloud_tests 
Add Joyent cloud provider tests
 2015-02-27 14:42:08 -07:00
Pedro Algarvio
62f868a076 Merge branch '2015.2' into develop 2015-02-27 10:02:47 +00:00
rallytime
cd5ad52c2e Fix pylint errors on develop 2015-02-26 09:43:52 +00:00
Pedro Algarvio
38ddbbc227 Fix imports 2015-02-26 09:41:22 +00:00
Pedro Algarvio
a24ae29ee9 Revert "We no longer warn." 
This reverts commit 5d35f856ac.
 2015-02-26 09:41:22 +00:00
Thomas S Hatch
87c6e0cbe9 Merge pull request #21023 from rallytime/bp-19303 
Backport #19303 to 2014.7
 2015-02-25 18:07:00 -07:00
Justin Findlay
581247f4b5 fix ssh test error 
introduced by #21006
 2015-02-25 15:27:03 -07:00
rallytime
565f10959d Add transport key to mocked opts to fix batch unit tests 2015-02-25 13:51:25 -07:00
Mike Place
90eb36eba6 Merge pull request #20992 from jfindlay/pub_args 
fix arg preparation for publish module
 2015-02-25 09:39:33 -07:00
Mike Place
b4bd491f8e Merge pull request #20981 from makinacorpus/psql 
postgres: role update support
 2015-02-25 09:35:15 -07:00
Mike Place
011f8c4e72 Adjust batch test 2015-02-25 09:32:03 -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
rallytime
e5c4cf8ab4 Move tearDown functionality into test_instance 
The new functions don't need to perform the tearDown behavior,
so that insurance should just be moved the function that needs it.
 2015-02-24 16:42:00 -07:00
rallytime
b2bc55f150 Add some more tests to catch API changes for digital ocean 2015-02-24 16:33:31 -07:00
Justin Findlay
5dace8f688 add integration test for #18317 2015-02-24 16:25:57 -07:00
jfindlay
35f1266c86 Merge pull request #20968 from jayeshka/win_firewall-unit-test 
adding win_firewall unit test case
 2015-02-24 16:23:40 -07:00
rallytime
95d4fb801c Skip the ec2 nightly cloud tests for now 
Something fundamental has changed with the way ec2 interacts with
the test runner starting in 2015.2 (and consequentially develop).
Let's skip these tests for now until we can pin down why so we don't
muddy the cloud-testing waters.
 2015-02-24 16:07:23 -07:00
Mathieu Le Marec - Pasquet
126e29c3eb pgsql: fix tests 2015-02-24 21:01:13 +01:00
Thomas S Hatch
cd072876b7 Merge pull request #20942 from cachedout/context_cache 
Context cache
 2015-02-24 11:30:11 -07:00
rallytime
e26cac4599 Pylint fix 2015-02-24 10:58:39 -07: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
Mike Place
26b3ec0be3 Context cache decorator 2015-02-23 19:27:27 -07:00
Justin Findlay
5ab5380094 adding cmd.run integration tests 2015-02-23 16:35:07 -07:00
Justin Findlay
ebc6a1f4c8 fix matcher tests for 2015.2->develop merge 2015-02-23 15:39:44 -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
5edb6cba11 Implement Bower state module 2015-02-21 05:57:54 +00: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
rallytime
b51492486f Add Joyent cloud provider tests 2015-02-20 17:25:07 -07:00
Colton Myers
c3b7be0655 Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2 
Conflicts:
	doc/topics/installation/rhel.rst
	salt/output/__init__.py
	salt/utils/__init__.py
 2015-02-20 13:51:59 -07:00
Jayesh Kariya
014ce111ab adding win_autoruns unit test case 2015-02-20 19:16:09 +05:30
jfindlay
ca79845b2f Merge pull request #20848 from rallytime/new_requisites_tests 
Integration tests for the new requisites added in 2014.7
 2015-02-19 18:29:00 -07:00
rallytime
c3f786c966 listen and listen_in requisite tests 2015-02-19 16:13:23 -07:00
rallytime
1437c9a1f5 onfail and onfail_in requisite tests 2015-02-19 14:35:26 -07:00
rallytime
208b4906d8 Onchanges and onchanges_in requisite tests! 2015-02-19 13:06:38 -07:00
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
rallytime
8f0e80bd66 Add one onchanges requisite test 2015-02-18 17:16:07 -07:00
Colton Myers
f00465a8a1 Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop 
Conflicts:
	doc/topics/event/index.rst
	salt/loader.py
	salt/modules/config.py
	salt/modules/cyg.py
	salt/modules/hg.py
	salt/modules/lxc.py
	salt/modules/upstart.py
	salt/states/hg.py
	salt/utils/cloud.py
	salt/utils/dictupdate.py
	salt/utils/schedule.py
	tests/integration/fileserver/gitfs_test.py
	tests/unit/pydsl_test.py
 2015-02-18 11:55:29 -07:00
Justin Findlay
0d6663b8a8 conform shell integration tests to txt runner 2015-02-17 15:40:17 -07:00
Justin Findlay
b39f962369 add state module requested state run tests 
closes #16901
 2015-02-17 14:23:14 -07:00
Thomas S Hatch
59640a051d Merge pull request #20694 from cachedout/sync_module_async 
Allow saltutil.refresh_modules to wait for completion
 2015-02-17 09:10:58 -07:00
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
Mike Place
6acdd30303 Lint 2015-02-14 21:23:54 -07:00
Mike Place
cb7d7653a3 Allow saltutil.refresh_modules to wait for completion 
Also added raet support to eventlisten as well as added functionality to connect to
 2015-02-13 14:14:47 -07:00
jfindlay
59eaabea0a Merge pull request #20688 from rallytime/bp-20125 
Backport #20125 to 2015.2
 2015-02-13 11:46:21 -07:00
rallytime
1f7d257767 Add some python 3 compatibility fixes for new test files 2015-02-13 11:30:45 -07:00
Mike Place
d1d52d2245 Avoid file cache problem in pydsl tests 
Using the same copy of opts was causing the cache refresh to not find
any files because they had already been cleaned up!
 2015-02-13 10:48:39 -07:00
Mike Place
7a9428d9f5 Typo 2015-02-13 10:17:17 -07:00
Mike Place
37b375ba8b Use cls attr 2015-02-13 10:17:17 -07:00
Mike Place
b9fa5e4e29 Reset env at end of test 2015-02-13 10:17:17 -07:00
jfindlay
26a0afdf57 Merge pull request #20661 from jacksontj/2015.2 
2015.2
 2015-02-13 08:49:59 -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
Thomas Jackson
90dc0ec4ec pylint 2015-02-12 17:06:41 -08:00
Thomas Jackson
c4b9c076e8 Check key types in lazyloader 
Better fix for #20623 and a test case
 2015-02-12 17:06:41 -08:00
Nicole Thomas
f82183d13d Merge pull request #19235 from terminalmage/lxc-refactor 
LXC Refactor
 2015-02-12 17:16:52 -07:00
Colton Myers
b2a80b195e Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2 2015-02-12 11:44:57 -07:00
Thomas S Hatch
9e054f3890 Merge pull request #20616 from rallytime/merge-20419 
Merge #20419 with test syntax fix
 2015-02-12 10:38:53 -07:00
Thomas S Hatch
174bc41a2c Merge pull request #20593 from thusoy/iptables-refactor 
Refactor iptables
 2015-02-12 10:38:37 -07:00
Tarjei Husøy
5e05fd717a Quote iptables args with leading/trailing spaces 2015-02-12 16:35:33 +01:00
rallytime
6b2d64b557 Fix second pylint error that popped up 2015-02-11 22:07:37 -07:00
rallytime
789570fb94 Fix pylint/syntax of test in which_test to merge #20419 2015-02-11 21:48:34 -07:00
Thomas S Hatch
b0ff607669 Merge pull request #20577 from cachedout/ioflo_dummy 
RAET performance testing
 2015-02-11 15:51:19 -07: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
a1043ab87a Merge pull request #20605 from jfindlay/tar 
fix tar check
 2015-02-11 15:04:27 -07:00
Justin Findlay
8b68244eaa chmod -x tests/runtests.py 2015-02-11 15:03:36 -07:00
Mike Place
e316b183e6 Simplify to just loop. No need for calibration since it doesn't max out. 2015-02-11 13:30:09 -07:00
Mike Place
e8472ed9cc Pylint 2015-02-11 13:30:09 -07:00
Alexander Schwartz
7c6b8f1221 clean up lint messages 2015-02-11 19:57:14 +00: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
Hung Nguyen Viet
d10ce3ade2 fix unittest for windows 2015-02-12 01:37:40 +07:00
Justin Findlay
657b79912e fix iptables unit tests for merge forward 2015-02-11 10:52:07 -07:00
rallytime
cffbca44b6 Pylint fix - remove unused import 2015-02-11 09:35:04 -07:00
rallytime
533adca23a Merge branch '2014.7' into merge_forward_15 2015-02-11 08:48:14 -07:00
Mike Place
194ad0f8b1 Last time with find removed 2015-02-11 08:45:37 -07:00
jfindlay
a4572f34f3 Merge pull request #20578 from rallytime/bp-20561 
Backport #20561 to 2014.7
 2015-02-10 20:51:23 -07:00
Mike Place
5db9172884 Lint btrfs test 2015-02-10 19:09:30 -07:00
Mike Place
c41998cc4f Remove another test. 2015-02-10 17:12:31 -07:00
Mike Place
836b525779 Disable gitfs test that does not produce valuable data 2015-02-10 17:11:04 -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
Mike Place
c5081179ef gitfs test lint fix 2015-02-10 14:57:28 -07:00
Erik Johnson
706ce858b4 Disable LXC integration tests for now 2015-02-10 15:06:47 -06:00
Erik Johnson
f18a23c284 Ignore lack of CLI example in deprecated function 2015-02-10 15:06:47 -06:00
Mike Place
78309a0e2d Last time with find removed 2015-02-10 13:40:33 -07:00
Mike Place
dbd74fbeee Remove another test. 2015-02-10 11:54:16 -07:00
Thomas S Hatch
54de4cc592 Merge branch 'feature-20340-gem-sources' of https://github.com/RobertFach/salt into RobertFach-feature-20340-gem-sources 2015-02-10 09:51:22 -07:00
Nicole Thomas
182fc23824 Merge pull request #20559 from rallytime/pylinting 
Fix python 3 compat errors that were inadvertently reverted
 2015-02-10 09:39:38 -07:00
Mike Place
1e14c9d097 Disable gitfs test that does not produce valuable data 2015-02-10 10:06:01 -07:00
rallytime
66cb14cea5 Fix python 3 compat errors that were inadvertently reverted 2015-02-10 09:07:09 -07:00
Mike Place
0341fdcdbd Merge pull request #20556 from cachedout/fix_loader_pylint 
Fix loader pylint
 2015-02-10 08:47:46 -07:00
Mike Place
c15756b50f Fix loader pylint 2015-02-10 09:14:34 -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
Thomas Jackson
cf5157c533 Support arbitrarily deep modules 
Note: salt can still only *call* modules on the first depth, but they can then import anything below
 2015-02-09 17:51:06 -08:00
Thomas Jackson
7ea33b23ce Change modulekey for submodule test-- to avoid namespace collisions 2015-02-09 17:51:05 -08:00
Thomas Jackson
ee69948dc4 pylint 2015-02-09 17:51:05 -08:00
Thomas Jackson
d869ce7e5f Add support for submodules to LazyLoader 
This was a feature that was inadvertently removed in #20274, but since it was undocumented and untested no one noticed. Thanks to @steverweber for pointing it out.

This includes the feature as well as tests.
 2015-02-09 17:51:05 -08: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
Mike Place
9b9a546bc9 Merge pull request #20473 from jacksontj/develop 
Add "disabled" support
 2015-02-09 11:09:32 -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
Alexander Schwartz
c05aae9ce7 added archive test script 2015-02-09 14:52:46 +00: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
Arnold Bechtoldt
9de6c1d839 improve test tests/unit/utils/validate_net_test.py useability 2015-02-09 11:52:08 +01:00
Arnold Bechtoldt
50ecfef1db do call class methods correctly 2015-02-09 09:45:12 +01:00
Arnold Bechtoldt
2c5f5f8bf7 fix pep8 lint checks, refs #20508 2015-02-09 09:14:38 +01:00
Arnold Bechtoldt
ef7834db76 fix broken ipv6 address verification in salt.utils.validate.net 2015-02-08 23:48:05 +01:00
Thomas Jackson
438ede78ba Support arbitrarily deep modules 
Note: salt can still only *call* modules on the first depth, but they can then import anything below
 2015-02-07 14:55:30 -08:00
Thomas Jackson
249096c292 Change modulekey for submodule test-- to avoid namespace collisions 2015-02-07 12:02:26 -08:00
Thomas Jackson
7605ba60a8 pylint 2015-02-07 12:02:26 -08:00
Thomas Jackson
ca5eac3936 Add support for submodules to LazyLoader 
This was a feature that was inadvertently removed in #20274, but since it was undocumented and untested no one noticed. Thanks to @steverweber for pointing it out.

This includes the feature as well as tests.
 2015-02-07 12:02:26 -08:00
Thomas Jackson
725708a04b Correct tag name in loader tests 2015-02-07 12:02:23 -08:00
Thomas Jackson
bb89068010 Add "disabled" support 
this allows you to "blacklist" modules.

Addition to #20274

Conflicts:
	salt/loader.py
 2015-02-07 12:02:03 -08:00
rallytime
15a140ece4 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-07 11:59:47 -08:00
Thomas Jackson
fb0d46f445 Pylint 2015-02-07 11:59:03 -08:00
Thomas Jackson
368e5a8e92 Add test for __func__alias__ 2015-02-07 11:59:03 -08:00
Thomas Jackson
9ee188dd90 More loader tests 
As well as an optimization on clear()
 2015-02-07 11:59:01 -08:00
Thomas Jackson
fe2d141081 Add loader tests 2015-02-07 11:59:00 -08:00
Thomas Jackson
726f8dc2ac Check that __context__ is always present, since it now is (properly) 2015-02-07 11:59:00 -08:00
Thomas Jackson
795fa12415 Remove test as well 
Conflicts:

	tests/unit/output/grains.py

Conflicts:
	tests/unit/output/grains.py
 2015-02-07 11:57:40 -08:00
Thomas Jackson
e1f8ea650f 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

Conflicts:
	salt/output/grains.py
 2015-02-07 11:57:14 -08:00
Thomas Jackson
02e219e452 Pack modules to runners 2015-02-07 11:54:39 -08:00
Alexander Schwartz
c193bed905 Changing file permissions for test runner to match manual 2015-02-07 15:46:07 +00:00
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
Thomas Jackson
07de054b81 Correct tag name in loader tests 2015-02-06 14:26:30 -08:00
Thomas Jackson
4e592f3aae Add "disabled" support 
this allows you to "blacklist" modules.

Addition to #20274
 2015-02-06 14:26:30 -08: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
Robert Fach
71d3e34342 implemented&tested gem state sources_add, sources_remove, added test cases 2015-02-04 17:27:35 +00: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
rallytime
759ce02829 Pylint fix for 2015.2 2015-02-03 10:02:05 -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