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
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
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
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
Justin Findlay
7c943ec8a7
only add successfully generated ssh keys to config
2015-02-04 16:16:41 -07: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
8eab04bd69
fix linux_sysctl_test failures caused by #20314
2015-02-03 11:30:27 -07:00
rallytime
759ce02829
Pylint fix for 2015.2
2015-02-03 10:02:05 -07:00
Mike Place
68418d79a7
Typo
2015-02-02 13:52:26 -07:00
Mike Place
5291cf7809
Better detection for minimum pyzmq version
2015-02-02 13:52:26 -07:00
rallytime
c65d9673a7
Merge branch '2014.7' into merge_forward_fifteen_second_try
...
Conflicts:
salt/states/file.py
2015-01-29 13:42:49 -07:00
Thomas Jackson
3d1ae49d09
Pass opts not an ImmutableDict of opts
2015-01-28 18:43:45 -08:00
Thomas Jackson
645027c0fe
cleanup "Caste jid as str (its an int all over), and change runner tag to correct prefix"
...
This reverts most of commit 745f2d84835ae23800358cd4dcc9c8525b502714.
apparently I picked up some other changes I didn't mean to
Conflicts:
salt/utils/event.py
tests/integration/utils/test_reactor.py
2015-01-28 18:43:43 -08:00
Thomas Jackson
5bfef71240
Pylint fix
2015-01-28 18:43:43 -08:00
Thomas Jackson
d8e8de2a19
Caste jid as str (its an int all over), and change runner tag to correct prefix
...
Conflicts:
salt/utils/event.py
2015-01-28 18:43:40 -08:00
Thomas S Hatch
daba06fac2
Merge pull request #20162 from rallytime/bp-20062
...
Backport #20062 to 2014.7
2015-01-28 15:06:07 -07:00
Thomas S Hatch
0b47a56773
Merge pull request #20000 from terminalmage/fix-19552
...
Better check for pillar for jinja templating
2015-01-28 14:35:56 -07:00
Mike Place
7c066c38a0
Increae default runner timeout to 60s
2015-01-28 13:56:41 -07:00
Nicole Thomas
a717549c4e
Merge pull request #20116 from rallytime/merge_forward_to_fifteen
...
Merge 2014.7 into 2015.2
2015-01-28 12:15:08 -07:00
Thomas S Hatch
19b7db40b8
Merge pull request #19914 from jfindlay/shell_false
...
change python_shell default to False
2015-01-28 10:41:16 -07:00
rallytime
592ff1c748
Add extension_modules to mocked __opts__ in test_sock_path_len
2015-01-28 09:20:26 -07:00
rallytime
03558dc013
Fix some of the mocking on cmdmod_test
...
This could still use some more love, but it should help for now.
2015-01-27 14:15:04 -07:00
rallytime
dc23823897
Merge branch '2014.7' into '2015.2'
...
Conflicts:
salt/modules/localemod.py
2015-01-27 13:24:14 -07:00
Thomas S Hatch
d199edde20
Merge pull request #20076 from rallytime/fix_states_file_tests
...
Add some mocked variables to fix the file_test failures
2015-01-26 20:38:53 -07:00
Erik Johnson
59e7481e2b
Fix TestSaltCacheLoader tests
...
Similar fixes as made for TestGetTemplate
2015-01-26 16:04:21 -06:00
rallytime
cdc8039b58
Add some mocked variables to fix the file_test failures
...
Also do a little clean up of states/file.py and salt/state.py
2015-01-26 14:11:56 -07:00
Erik Johnson
d34c0c7787
Fix jinja tests
...
With recent edits to the jinja templating system, file_roots and
pillar_roots are referenced, so they need to be in the mocked opts dict.
2015-01-26 13:10:05 -06:00
rallytime
299374a211
Change image name in rackspace profile config to a valid one
2015-01-24 20:14:23 -07:00
Pedro Algarvio
20e67986b3
Fix calls using user instead of runas. Make use of user.
2015-01-24 03:16:52 +00:00
Pedro Algarvio
a6c3915049
Fix order for proper diff on failure
2015-01-24 03:16:51 +00:00
Pedro Algarvio
da7fefaea6
Fix mock calls
2015-01-24 03:16:51 +00:00
Pedro Algarvio
5d35f856ac
We no longer warn.
2015-01-24 03:16:51 +00:00
Mike Place
09d3d62174
Loosen test constraint and update runas arg
2015-01-24 03:16:50 +00:00
Mike Place
d9c9eb1a6a
Yet even more test fixing. *sigh*
2015-01-24 03:16:50 +00:00
Mike Place
e7d959b6a5
Even MORE test fixing
2015-01-24 03:16:50 +00:00
Mike Place
7222d741de
Even more pip test fixing
2015-01-24 03:16:50 +00:00
