valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 17:09:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
62,052 Commits 24 Branches 182 Tags 341 MiB
f13e9435b1
Commit Graph

54 Commits

Author SHA1 Message Date
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
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
726f8dc2ac Check that __context__ is always present, since it now is (properly) 2015-02-07 11:59:00 -08:00
Thomas Jackson
02e219e452 Pack modules to runners 2015-02-07 11:54:39 -08: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
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
307e5c1473 Check that __context__ is always present, since it now is (properly) 2015-02-05 09:20:30 -08:00
Thomas Jackson
509b4352f2 Pack modules to runners 2015-02-05 09:20:27 -08:00
Pedro Algarvio
fdd2a3e246 Correct the iteration 2015-01-30 22:25:19 +00:00
Pedro Algarvio
2d8b216bcd Py3 compatibility fixes 2015-01-30 22:25:05 +00:00
Pedro Algarvio
60f215f191 Add from __future__ import absolute_import 2015-01-30 22:25:04 +00:00
rallytime
ac40a5b2da Fix linode test failures and test all modules 2014-09-25 11:34:50 -06:00
Pedro Algarvio
55cd462fa7 No need to iterate through keys 2014-06-21 15:34:33 +01:00
Pedro Algarvio
c952a4d61b Remove unused import. White-space lint fix 2014-06-21 15:33:11 +01:00