Pedro Algarvio
451d8f98e3
The file listing needs to be sorted to return expectable results.
...
This seems like the only reasonable way to override, for example, grains.
Grains from `custom_grains_2` should override grains from `custom_grains_1`.
2017-06-01 18:47:22 +01:00
Pedro Algarvio
2ee6d5d589
Import from the original modules not tests.integration
2017-04-04 18:58:19 +01:00
Pedro Algarvio
7219a35656
These are not integration tests
2017-03-28 19:00:50 +01:00
Pedro Algarvio
07d0a5ed20
Cleanup after ourselves
2017-03-08 18:34:32 +00:00
twangboy
ad654abc20
Clarify the reason for the while loop
2017-03-01 14:00:06 -07:00
twangboy
25b6d221c4
Fix ext_grains and ext_modules tests for Windows
2017-03-01 14:00:06 -07:00
Pedro Algarvio
40a64191a1
Absolute imports and A LOT of code cleanup.
2017-03-01 01:33:07 +00:00
Pedro Algarvio
3beb3fb801
Move whatever we need from salttesting to salt.
...
Let's drop the salttesting dependency cycle.
2017-02-28 22:52:49 +00:00
Pedro Algarvio
1b84bee06f
Enforce and preserve module loading order.
...
This is the only way we can have predictable results when overriding,
for example, grains.
2017-02-24 09:11:22 +00:00
Pedro Algarvio
15af4c9728
Test filenames conformity. Adjust for pytest.
2017-02-23 23:19:42 +00:00
Mike Place
dcd9ff471f
Merge pull request #39302 from terminalmage/loader-virtual-aliases
...
Add __virtual_aliases__ feature to the loader
2017-02-13 13:22:02 -07:00
Pedro Algarvio
ff1667c6d6
We really don't need to decode the string prior to writing it to file.
...
Plus, this also avoids handling Py2 and Py3 differently.
2017-02-13 16:25:09 +00:00
Erik Johnson
954752b5fd
Add test for __virtual_aliases__
2017-02-10 08:48:57 -06:00
Erik Johnson
9938c4ba0d
Make integration.loader.loader tests PY3-compatible
...
Note that the LazyLoader still doesn't work quite right, the tests still
fail. But, this resolves Python 3 incompatibility issues.
2016-08-03 17:21:31 -05:00
rallytime
c8930339d3
Remove iteritems() references from integration tests
2016-07-19 10:15:23 -06:00
rallytime
815c8b38d5
Merge branch '2015.8' into '2016.3'
...
No conflicts.
2016-07-08 10:34:32 -06:00
Mike Place
6b8c76af83
Prevent many errors in the test suite in loader tests ( #34521 )
...
Pack in what the loader needs.
2016-07-07 17:03:45 -04:00
rallytime
fa4650523e
Pylint fixes
2016-03-18 12:21:09 -06:00
rallytime
6360ecd3b3
Merge branch '2015.8' into '2016.3'
...
Conflicts:
- salt/cloud/clouds/scaleway.py
- salt/config/__init__.py
- salt/log/mixins.py
- salt/minion.py
- salt/modules/ps.py
- salt/utils/decorators/__init__.py
- salt/utils/schema.py
- tests/unit/modules/etcd_mod_test.py
- tests/unit/modules/file_test.py
2016-03-18 11:26:12 -06:00
rallytime
85e5acd11a
Merge #31903 with pylint fix
...
Merges #31903
2016-03-15 14:05:09 -06:00
Erik Johnson
394410e2b0
Add integration test for depends decorator
2016-03-14 22:16:10 -05:00
Christophe Drevet-Droguet
89e7578d21
loader test for external grains deep merge (non-functional)
...
This test is disabled until we have a way to reload the minion, or
just the custom grains, with the grains_deep_merge option set.
2015-11-20 08:44:29 +01:00
Christophe Drevet-Droguet
f13e9435b1
loader test for custom grains
2015-11-18 22:08:24 +01:00
Mike Place
27b917b623
Adjust tests for new loader spec
2015-11-16 12:23:05 -07:00
Kent Shultz
73236b4ea8
commit 7b262f8 missed one fix
2015-10-28 17:18:01 -07:00
Mike Place
e9bdd746ab
Merge pull request #28349 from s0undt3ch/features/signal-handling-from-scratch
...
Proper signal handling - [Different approach]
2015-10-28 11:16:49 -06:00
Pedro Algarvio
7d9e310bc3
Shut up pylint
2015-10-28 14:24:44 +00:00
Pedro Algarvio
7b262f8bf7
Import 'integrations' not 'tests.integrations'
2015-10-28 14:24:44 +00:00
Thayne Harbaugh
a584ba567b
Test for loader collisions between modules and packages
...
What gets loaded from the following layout?:
foo.py:bar()
foo/__init__.py:bar()
This used to raise an exception (up until yesterday). For now this ensures
that foo/__init__.py:bar() has higher priority than foo.py:bar() when
foo.bar() is referenced.
2015-10-22 13:49:09 -06:00
Colton Myers
964a47c643
Fix tests
2015-08-28 13:50:31 -06:00
Colton Myers
667dfcee14
Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8
...
Conflicts:
salt/renderers/gpg.py
tests/integration/loader/loader.py
2015-08-21 16:44:59 -06:00
Jenkins
41541e4e2b
Fix many errors with __virtual__ in tests
...
Also stop using __salt__ in __virtual__ which is not guaranteed to exist
2015-08-21 14:01:03 -06:00
Aneesh Agrawal
4b9311507c
Add new module type for serializers from issue #22257 .
...
Move existing serializers from salt.utils.serializers to
salt.serializers.
2015-05-28 20:03:11 -04:00
Colton Myers
1a38b4b834
Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop
...
Conflicts:
salt/cli/salt.py
salt/client/mixins.py
salt/renderers/pyobjects.py
2015-04-22 11:07:01 -06:00
Thomas Jackson
98af7c3f95
Cleanup jinja attribute access for loader
...
Refactor of #22723
2015-04-21 22:39:17 -07:00
Colton Myers
000de95974
Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop
...
Conflicts:
.pylintrc
doc/ref/runners/all/salt.runners.nacl.rst
doc/topics/cloud/config.rst
salt/cli/salt.py
salt/client/mixins.py
salt/client/ssh/__init__.py
salt/loader.py
salt/minion.py
salt/modules/cassandra_cql.py
salt/modules/gpg.py
salt/modules/grains.py
salt/modules/iptables.py
salt/modules/yumpkg.py
salt/netapi/rest_cherrypy/app.py
salt/renderers/pyobjects.py
salt/returners/mysql.py
salt/runners/jobs.py
salt/state.py
salt/states/file.py
salt/states/service.py
salt/utils/minions.py
tests/integration/__init__.py
tests/integration/netapi/rest_tornado/test_app.py
tests/integration/states/cmd.py
2015-04-16 12:15:44 -06:00
Thomas S Hatch
c003252a8e
Fix test
2015-04-16 09:33:50 -06:00
Colton Myers
0b7ac988cc
Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop
...
Conflicts:
.pylintrc
salt/beacons/service.py
salt/beacons/sh.py
salt/modules/cassandra_cql.py
salt/returners/cassandra_cql_return.py
2015-04-01 14:22:33 -06:00
rallytime
7b859df4d1
Merge #22246 with pylint fix and test cleanup
...
Refs #22246
2015-04-01 10:29:23 -06:00
Thomas Jackson
d70e094183
Add initial tests for loader's public interfaces
...
Tests for #22117
2015-04-01 07:55:02 -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
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
Mike Place
c15756b50f
Fix loader pylint
2015-02-10 09:14:34 -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
Mike Place
9b9a546bc9
Merge pull request #20473 from jacksontj/develop
...
Add "disabled" support
2015-02-09 11:09:32 -07: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
