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
726f8dc2ac
Check that __context__ is always present, since it now is (properly)
2015-02-07 11:59:00 -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
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
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
rallytime
e256943fd6
Pylint fix for develop
2015-02-06 10:04:52 -07:00
rallytime
eaa879a64e
Python 3 compat for tests/integration/loader/globals.py
2015-02-06 07:48:20 -07:00
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
Thomas Jackson
f01a5c5fbd
Pylint
2015-02-05 12:17:48 -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
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
Justin Findlay
7c943ec8a7
only add successfully generated ssh keys to config
2015-02-04 16:16:41 -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
Thomas S Hatch
cefb78efe9
Merge pull request #17883 from s0undt3ch/features/pylint-py3-modernize
...
[Don't merge yet] Py3 compat changes & Update pylintrc to load the py3modernize plugin
2015-01-31 03:13:53 -07:00
rallytime
310e9075bf
Pylint disable StrictVersion import error
2015-01-30 17:32:17 -07:00
Mike Place
710bb63103
Typo
2015-01-30 16:02:56 -07:00
Mike Place
69c5e1f904
Better detection for minimum pyzmq version
2015-01-30 16:01:59 -07:00
Pedro Algarvio
34c75b1a8d
The dictionary changes while iterating. Run over a list of keys.
2015-01-30 22:27:14 +00:00
Pedro Algarvio
ac15f12349
Py3 compatibility
2015-01-30 22:27:10 +00:00
Pedro Algarvio
4a25daa211
Py3 compatibility
2015-01-30 22:27:10 +00:00
Pedro Algarvio
ff636249f4
Py3 compatibility
2015-01-30 22:27:10 +00:00
Pedro Algarvio
6b0c88e3bf
Py3 compatibility
2015-01-30 22:27:05 +00:00
Pedro Algarvio
ca06f278eb
Py3 compatibility fixes.
2015-01-30 22:25:31 +00:00
Pedro Algarvio
5dab3e0d7d
Py3 compatibility fixes.
2015-01-30 22:25:29 +00:00
Pedro Algarvio
dc2d3b8ba2
The imports do work!
2015-01-30 22:25:29 +00:00
Pedro Algarvio
788bb913c6
Py3 compatibility fixes.
2015-01-30 22:25:28 +00:00
Pedro Algarvio
79be964dc2
We need to write something, even an empty string
2015-01-30 22:25:19 +00:00
Pedro Algarvio
e6ab1d4ba1
Fix import
2015-01-30 22:25:19 +00:00
Pedro Algarvio
fdd2a3e246
Correct the iteration
2015-01-30 22:25:19 +00:00
Pedro Algarvio
403abc88e1
Py3 compatibility fixes
2015-01-30 22:25:10 +00:00
Pedro Algarvio
91d185153c
Py3 compatibility fixes
2015-01-30 22:25:10 +00:00
Pedro Algarvio
5d570561fd
Py3 compatibility fixes
2015-01-30 22:25:10 +00:00
Pedro Algarvio
665127c932
Py3 compatibility fixes
2015-01-30 22:25:10 +00:00
Pedro Algarvio
fda912f2d8
Py3 compatibility fixes
2015-01-30 22:25:10 +00:00
Pedro Algarvio
7360164558
Py3 compatibility fixes
2015-01-30 22:25:09 +00:00
Pedro Algarvio
fcd9832863
Py3 compatibility fixes
2015-01-30 22:25:09 +00:00
Pedro Algarvio
ec93519312
Py3 compatibility fixes
2015-01-30 22:25:09 +00:00
Pedro Algarvio
f07427a0ed
Py3 compatibility fixes
2015-01-30 22:25:09 +00:00
Pedro Algarvio
b54c02930f
Py3 compatibility fixes
2015-01-30 22:25:09 +00:00
Pedro Algarvio
8fa37d65eb
Py3 compatibility fixes
2015-01-30 22:25:09 +00:00
Pedro Algarvio
cb6531293c
Py3 compatibility fixes
2015-01-30 22:25:09 +00:00
Pedro Algarvio
b555ddf658
Py3 compatibility fixes
2015-01-30 22:25:09 +00:00
Pedro Algarvio
b791dd6971
Py3 compatibility fixes
2015-01-30 22:25:09 +00:00
Pedro Algarvio
81ae50fac0
Py3 compatibility fixes
2015-01-30 22:25:09 +00:00
Pedro Algarvio
eca6f730db
Py3 compatibility fixes
2015-01-30 22:25:08 +00:00
Pedro Algarvio
207f3ddbf1
Py3 compatibility fixes
2015-01-30 22:25:08 +00:00
Pedro Algarvio
4ae7e918e9
Py3 compatibility fixes
2015-01-30 22:25:08 +00:00
Pedro Algarvio
f5928068b3
Py3 compatibility fixes
2015-01-30 22:25:08 +00:00
Pedro Algarvio
3624b911b3
Py3 compatibility fixes
2015-01-30 22:25:08 +00:00
Pedro Algarvio
3f24dcfa80
Import six at a later stage
2015-01-30 22:25:07 +00:00
Pedro Algarvio
fdc467b587
Py3 compatibility fixes
2015-01-30 22:25:05 +00:00
Pedro Algarvio
a4e48e8873
Py3 compatibility fixes
2015-01-30 22:25:05 +00:00
Pedro Algarvio
2d8b216bcd
Py3 compatibility fixes
2015-01-30 22:25:05 +00:00
Pedro Algarvio
f59d669a58
Py3 compatibility fixes
2015-01-30 22:25:04 +00:00
Pedro Algarvio
4eadb88bfa
Py3 compatibility fixes
2015-01-30 22:25:04 +00:00
Pedro Algarvio
0bc44131e8
Py3 compatibility fixes
2015-01-30 22:25:04 +00:00
Pedro Algarvio
0577610258
Py3 compatibility fixes
2015-01-30 22:25:04 +00:00
Pedro Algarvio
dd146ca3e5
Py3 compatibility fixes
2015-01-30 22:25:04 +00:00
Pedro Algarvio
5bc0c157b6
Py3 compatibility fixes
2015-01-30 22:25:04 +00:00
Pedro Algarvio
60f215f191
Add from __future__ import absolute_import
2015-01-30 22:25:04 +00:00
rallytime
9898fcf613
Merge branch '2015.2' into 'develop'
...
Conflicts:
.gitignore
.pylintrc
.testing.pylintrc
salt/client/mixins.py
salt/cloud/clouds/msazure.py
salt/config.py
salt/modules/mount.py
salt/runners/doc.py
salt/utils/event.py
salt/utils/reactor.py
2015-01-29 17:24:04 -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
Mike Place
7c066c38a0
Increae default runner timeout to 60s
2015-01-28 13:56:41 -07:00
Thomas Jackson
4db02487f1
Pass opts not an ImmutableDict of opts
2015-01-27 13:11:01 -08: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
bf397d12b3
Merge pull request #20094 from basepi/merge-forward-develop
...
Merge forward from 2015.2 to develop
2015-01-27 10:04:51 -07:00
Colton Myers
c4da7bdd64
Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop
...
Conflicts:
salt/client/mixins.py
salt/daemons/flo/__init__.py
2015-01-26 19:44:59 -07:00
Mike Place
0b38efaaad
Increae default runner timeout to 60s
2015-01-26 10:59:55 -07:00
rallytime
299374a211
Change image name in rackspace profile config to a valid one
2015-01-24 20:14:23 -07:00
Pedro Algarvio
a6c3915049
Fix order for proper diff on failure
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
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
rallytime
69d7a6ebd0
Pylint fixes for the 2015.2 branch
2015-01-23 10:57:18 -07:00
Thomas S Hatch
9cdbf2b2f7
Merge pull request #19972 from rallytime/bp-19746
...
Backport #19746 to 2015.2
2015-01-22 17:55:27 -07:00
Mathias Gug
4670988a68
Fix style.
2015-01-22 14:41:05 -07:00
Mathias Gug
3b285798e3
Fix style.
2015-01-22 14:40:58 -07:00
Mathias Gug
dd097b730d
Fix style issues.
2015-01-22 14:40:49 -07:00
Mathias Gug
4542072c4e
Add boto_sns module and state.
...
Include integration tests.
2015-01-22 14:40:32 -07:00
Mathias Gug
a454d71bd5
Fix coding style.
2015-01-22 14:24:30 -07:00
Mathias Gug
adf4c7a1af
Skip boto_iam integration tests if boto is not available
...
or properly configured.
2015-01-22 14:24:30 -07:00
Mathias Gug
6a18c71f1d
Add comment.
2015-01-22 14:24:29 -07:00
Mathias Gug
0d158cfa12
Add get_account_id function boto_iam
...
so that we can retrieve the AWS account id associated with the
credentials used to connect to AWS.
2015-01-22 14:24:29 -07:00
Mathias Gug
f4c75375f4
Make sure boto_sns state is idempotent.
2015-01-22 12:13:33 -08:00
Mathias Gug
85ec021a73
Merge remote-tracking branch 'upstream/develop' into support-sns-subscriptions
...
Conflicts:
tests/integration/states/boto_sns.py
2015-01-22 11:11:51 -08:00
Mathias Gug
b79756bdd5
Support subscriptions in sns topic state.
2015-01-22 11:04:31 -08:00
Pedro Algarvio
8dbb7394b2
White-space lint fix
2015-01-21 14:17:03 +00:00
Pedro Algarvio
b0920b226e
We still support Python 2.6, so, we need indexes.
2015-01-21 02:11:48 +00:00
Thomas S Hatch
8bfb79c8d9
Merge pull request #19812 from matthew-muscat/develop
...
Update hosts file creation for consistency and improved readability
2015-01-20 14:52:01 -07:00
Thomas S Hatch
1569520a4b
Merge pull request #19792 from rallytime/merge_forward_develop
...
Merge 2015.2 forward into develop
2015-01-17 09:39:02 -07:00
Matthew Muscat
f44d67471d
Update hosts module test
...
Update test case to account for formatting changes in b82001fcd4
2015-01-18 00:33:00 +11:00
Thomas S Hatch
fab600add9
Merge pull request #19746 from lyft/add-boto-sns-module
...
Add boto_sns module and state.
2015-01-16 16:58:09 -07:00
Chris Rebert
19e262bb7b
Fix typos with the help of https://github.com/vlajos/misspell_fixer
2015-01-16 13:35:47 -08:00
rallytime
d724ed3a47
Merge branch '2015.2' into 'develop'
...
Conflicts:
salt/cli/batch.py
salt/cloud/clouds/msazure.py
tests/integration/netapi/rest_tornado/test_app.py
2015-01-16 11:36:32 -07:00
Mathias Gug
64cf74ebaa
Fix style.
2015-01-14 16:05:36 -08:00
Mathias Gug
6ffc9f827e
Fix style.
2015-01-14 16:04:25 -08:00
Mathias Gug
e5ab359bdd
Fix style issues.
2015-01-14 16:02:50 -08:00
Mathias Gug
6f9fbe23d6
Add boto_sns module and state.
...
Include integration tests.
2015-01-14 15:43:06 -08:00
Mathias Gug
97d0f93fd3
Fix coding style.
2015-01-14 13:06:43 -08:00
Erik Johnson
175ba127be
Merge branch '2014.7' into 2014.7-2015.2
...
Conflicts:
salt/modules/archive.py
2015-01-14 14:26:22 -06:00
Mathias Gug
30625a0437
Skip boto_iam integration tests if boto is not available
...
or properly configured.
2015-01-14 11:49:54 -08:00
Mathias Gug
61eeac5465
Add comment.
2015-01-14 11:12:23 -08:00
Mathias Gug
3ff36a9692
Add get_account_id function boto_iam
...
so that we can retrieve the AWS account id associated with the
credentials used to connect to AWS.
2015-01-14 11:08:54 -08:00
Mike Place
c172470c30
Try giving some rest tornado requests a little more time
2015-01-13 14:17:55 -07:00
Thomas S Hatch
f1391fb8d9
Merge pull request #19667 from cachedout/ssh_tests
...
Fix tests
2015-01-13 08:14:34 -07:00
Mike Place
fc9a647a3b
Remove assert:
2015-01-12 18:53:56 -07:00
Mike Place
cba0d6d597
Fix tests
2015-01-12 16:01:10 -07:00
Mike Place
74501f56ae
Fix tornado tests
...
The tornado test runner isn't respecting timeouts as it claims it
should in async mode. However, the env variable is working as-described.
2015-01-12 15:36:34 -07:00
Thomas S Hatch
c79871e77d
Merge pull request #19637 from s0undt3ch/develop
...
Merge branch '2015.2' into develop
2015-01-12 11:33:14 -07:00
Pedro Algarvio
c3bc043b23
Merge branch '2015.2' into develop
...
Conflicts:
salt/syspaths.py
setup.py
tests/integration/__init__.py
2015-01-11 22:45:35 +00:00
Pedro Algarvio
9d0fe5b1d1
Merge branch '2014.7' into 2015.2
...
Conflicts:
salt/modules/brew.py
tests/integration/__init__.py
2015-01-11 22:40:16 +00:00
Thomas Jackson
e35c7ac313
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-10 16:32:24 -08:00
Thomas Jackson
d352057f11
Pylint fix
2015-01-10 16:31:59 -08:00
Thomas Jackson
c17462d062
Caste jid as str (its an int all over), and change runner tag to correct prefix
2015-01-10 16:30:00 -08:00
Mike Place
0e935486de
Merge pull request #19605 from jacksontj/develop
...
Fixes for develop
2015-01-10 08:54:59 -07:00
Thomas Jackson
925afac98d
Temporarily change this test to work around race condition in the runnerclient
...
@rallytime If you have some list of tests that are disabled that shouldn't be, this is one for the list :)
2015-01-10 00:18:16 -08:00
Mike Place
1277b71e2d
Typo
2015-01-09 21:22:40 -07:00
Mike Place
7d4123c6b3
Async flag and test cleanup
2015-01-09 21:21:50 -07:00
Thomas S Hatch
98cc0f88b4
Merge pull request #19585 from cachedout/async_flag_for_test_run
...
Async flag for test run
2015-01-09 17:50:52 -07:00
Mike Place
7aec24e8e1
Typo
2015-01-09 13:26:25 -07:00
Mike Place
9d7990f264
Async flag and test cleanup
2015-01-09 13:14:33 -07:00
rallytime
d6b3f69c19
Cleaner and actual fix for the failing weird pip test for CentOS 5
2015-01-09 13:10:09 -07:00
Colton Myers
3ce5eb2838
Merge branch '2014.7' into merge-forward-2015.2
...
Conflicts:
salt/modules/archive.py
salt/modules/brew.py
salt/modules/pip.py
tests/unit/modules/archive_test.py
tests/unit/modules/pip_test.py
2015-01-09 11:39:09 -07:00
rallytime
28cb062697
Cleaner and actual fix for the failing weird pip test for CentOS 5
2015-01-09 10:52:55 -07:00
rallytime
ea769829af
Fix my pylint errors
2015-01-08 15:09:55 -07:00
rallytime
41841701e7
Fix djangomod.py integration test failures
2015-01-08 12:57:11 -07:00
Mike Place
ca9a871d43
Merge pull request #19536 from rallytime/pip_test_fix
...
Don't run weird pip install test on CentOS 5
2015-01-08 12:21:08 -07:00
rallytime
71ef3f7744
Keep package name the same
2015-01-08 12:13:26 -07:00
rallytime
a0f801f475
Skip this test when we are running on centOS 5
2015-01-08 12:11:51 -07:00
Colton Myers
a60fa6b3d1
Merge branch '2015.2' into develop
2015-01-08 11:29:08 -07:00
Mike Place
d6ce858c23
Try giving some rest tornado requests a little more time
2015-01-08 10:04:19 -07:00
