Commit Graph

46437 Commits

Author SHA1 Message Date
Rupesh Tare
3484419377 implementd unit test cases for monit module 2015-02-06 20:05:41 +05:30
Mike Place
67473c5408 Merge pull request #20446 from jacksontj/loader
Fix mis-naming from pylint cleanup
2015-02-05 20:55:17 -07:00
Mike Place
3c8217528e Merge pull request #20444 from cachedout/async_client_outputter
Use correct outputter in asynclient mixin
2015-02-05 20:20:04 -07:00
Thomas Jackson
c8fdc9aaea Fix mis-naming from pylint cleanup 2015-02-05 19:01:37 -08:00
Mike Place
7f2f0e8ec3 Fix double-call (thanks @s0undt3ch) 2015-02-05 18:12:06 -07:00
Mike Place
1202c36137 Use correct outputter in asynclient mixin
This is necessary for runners that specify an outputter in their allowed args
2015-02-05 17:51:09 -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
ef3fd7ce90 Merge pull request #20431 from SmithSamuelM/sam_20150124
Changed test from str to basestring
2015-02-05 14:09:14 -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 S Hatch
854165c536 Merge pull request #20371 from cournape/fix_https_handling_windows_installer
DOC: add certifi to get proper https support.
2015-02-05 14:00:44 -07:00
Thomas S Hatch
bf8d519221 Merge pull request #20357 from cachedout/pillar_compile
Don't try to compile empty pillars
2015-02-05 13:53:32 -07:00
Thomas S Hatch
9af5ee2e25 Merge pull request #20350 from cachedout/socket_iter
Avoid socket list changing during iteration
2015-02-05 13:50:23 -07:00
Mike Place
c4e7bd6d27 Merge pull request #20429 from cachedout/prereq_keywords
Fix broken state.orch prereqs
2015-02-05 13:26:20 -07:00
Thomas Jackson
f01a5c5fbd Pylint 2015-02-05 12:17:48 -08:00
Samuel M Smith
c7530ebd89 Changed test from str to basestring
in order to support python3 raet now may have unicode strings in msgs.
2015-02-05 12:58:09 -07:00
Mike Place
a55f556964 Fix broken state.orch prereqs
All prereqs using salt.state in orchestrations were broken when using prereqs. This resolves that.
2015-02-05 12:54:02 -07:00
Joseph Hall
f1c3c63970 Merge pull request #20386 from cachedout/issue_19916
Don't run cron as a user with -u on Linux
2015-02-05 12:23:03 -07:00
Joseph Hall
c4cec24646 Merge pull request #20395 from jfindlay/mv_zsh_cmp
mv zsh completion to pkg/
2015-02-05 12:20:04 -07:00
Joseph Hall
969315bbda Merge pull request #20415 from shahn/develop
Update Macports Portfile
2015-02-05 12:18:08 -07:00
Joseph Hall
6539930a7b Merge pull request #20427 from kaithar/issue/mysql-null-test-fix
Fix for mysql pillar's ignore_null
2015-02-05 12:17:33 -07:00
Joseph Hall
cf2bc2d9c0 Merge pull request #20402 from cachedout/issue_19643
Copy perms of destination file when backing up
2015-02-05 12:08:30 -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
Joseph Hall
ab9ec6ba76 Merge pull request #20359 from patrickshan/develop
ignore null string from blkid output
2015-02-05 11:55:22 -07:00
Kaithar
529f4f6ae2 Compare against None rather than basing off anything that evaluates true 2015-02-05 17:28:45 +00:00
Thomas Jackson
b762c72a2a Add test for __func__alias__ 2015-02-05 09:20:30 -08:00
Thomas Jackson
e2184bd3ee Remove some old unused code 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
19132b1215 Since clear() removes all modules, reloads are unecessary 2015-02-05 09:20:30 -08:00
Thomas Jackson
d163f7b5ef Minor performance improvement 2015-02-05 09:20:30 -08:00
Thomas Jackson
fb43ca4983 If you have the module loaded, lets not require another hit to disk 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
259be3aa03 remove old deprecated mechanism 2015-02-05 09:20:29 -08:00
Thomas Jackson
9404575bb8 Fix process_virtual error_reasons
Never used, so I fixed it up to not be a list-- since you can only have one. We will also log this as an error, for now since the module is asking for an error
2015-02-05 09:20:29 -08:00
Thomas Jackson
1c13697172 Misc cleanup 2015-02-05 09:20:29 -08:00
Thomas Jackson
dcf4550f4e Cleanup FunctionWrapper 2015-02-05 09:20:29 -08:00
Thomas Jackson
0f77253e27 Remove unecessary format, a string is always a string 2015-02-05 09:20:29 -08:00
Thomas Jackson
33597d2f77 Move "pack" over to a dict
Since it doesn't make sense to allow for duplicate "name" pack items, we should just use a dict. This also makes sharing __context__ between all the plugins *significantly* cleaner
2015-02-05 09:20:29 -08:00
Thomas Jackson
ac6046c2cf Inject globals after verifying the function-- because it might not exist! 2015-02-05 09:20:29 -08:00
Thomas Jackson
5b6f31a31e Attempt dict access
Apparently SSH FunctionWraper breaks when you do just the "in" comparator
2015-02-05 09:20:29 -08:00
Thomas Jackson
95dd62f24d Conditionally inject context (if no one else has) 2015-02-05 09:20:29 -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
9339b14d33 Some more cleanup to grains outputter, closer to working 2015-02-05 09:20:29 -08:00
Thomas Jackson
7b03fad8cd Rename NewLazyLoader to LazyLoader (since the old one was deleted) 2015-02-05 09:20:29 -08:00
Thomas Jackson
69f73df099 __salt__ is not a lazydict object, not a dict.
In addition, since _yaml_result_unicode_to_utf8 is recursive, there is no need for the depth under the OrderedDict section
2015-02-05 09:20:28 -08:00
Thomas Jackson
3840dbc7ff Rename func, since it overlaps (works because of ordering, but still...) 2015-02-05 09:20:28 -08:00
Thomas Jackson
a3bee1b963 Pylint 2015-02-05 09:20:28 -08:00
Thomas Jackson
3001d88459 Proper precedence of file extensions 2015-02-05 09:20:28 -08:00