valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-09 01:36:48 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
59,228 Commits 24 Branches 182 Tags 341 MiB
596843e8d6
Commit Graph

131 Commits

Author SHA1 Message Date
Weilu Jia
596843e8d6 Add test case for sls with only import 
Tests https://github.com/saltstack/salt/issues/10852
 2015-11-23 18:27:56 -08:00
justinta89
d88ac2589f Changed grain to look at osmajorrelease instead of osrelease 2015-10-14 10:42:55 -06:00
mattmb
a5607d5e07 Multiple onchanges requisite behaviour 
Change the onchanges requisite so that if you list multiple onchanges
requisites then only one must change to trigger the state. Currently all
the watched states must change to cause the trigger. This fixes #19592
 2015-06-16 15:02:11 +01:00
Colton Myers
58aed60838 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop 
Conflicts:
    salt/runners/lxc.py
 2015-05-21 11:27:52 -06:00
rallytime
9e0ec07d85 Skip the gpodder pkgrepo test - they don't have vivid ppa up yet 2015-05-20 14:08:42 -06: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
586b81b33e Add tests for the jinja demands 2015-04-15 16:39:08 -06:00
Colton Myers
d17c908b42 Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop 
Conflicts:
	doc/topics/pillar/index.rst
	salt/beacons/diskusage.py
	salt/beacons/network_info.py
	salt/minion.py
	salt/modules/iptables.py
	salt/modules/nacl.py
	salt/modules/win_firewall.py
 2015-03-09 12:52:14 -06:00
Thomas Jackson
7a5ac0245d Pylint fix 2015-03-06 17:47:18 -08:00
Thomas Jackson
9fa37fd46b Add raw boolean support to depends decorator 2015-03-05 21:59:10 -08:00
C. R. Oldham
f171df4311 Merge forward 2015.2->develop 2015-03-01 19:54:22 -07:00
C. R. Oldham
00942f2060 Merge forward 2014.7->2015.2 2015-03-01 17:55:25 -07:00
Justin Findlay
17b8f73f1b add cmd module integration tests 2015-02-27 16:30:05 -07:00
Colton Myers
c8eb2d4665 Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop 
Conflicts:
	doc/topics/installation/windows.rst
	salt/cloud/clouds/joyent.py
	salt/daemons/flo/core.py
	salt/minion.py
 2015-02-23 14:25:51 -07:00
Colton Myers
c3b7be0655 Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2 
Conflicts:
	doc/topics/installation/rhel.rst
	salt/output/__init__.py
	salt/utils/__init__.py
 2015-02-20 13:51:59 -07:00
rallytime
c3f786c966 listen and listen_in requisite tests 2015-02-19 16:13:23 -07:00
rallytime
1437c9a1f5 onfail and onfail_in requisite tests 2015-02-19 14:35:26 -07:00
rallytime
208b4906d8 Onchanges and onchanges_in requisite tests! 2015-02-19 13:06:38 -07:00
rallytime
8f0e80bd66 Add one onchanges requisite test 2015-02-18 17:16:07 -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
Justin Findlay
b39f962369 add state module requested state run tests 
closes #16901
 2015-02-17 14:23:14 -07:00
Pedro Algarvio
60f215f191 Add from __future__ import absolute_import 2015-01-30 22:25:04 +00:00
Thomas Jackson
d2b548a0e7 Add regression test for #17051 2014-10-30 16:43:06 -07:00
Daniel Mizyrycki
54738d0ff5 Added salt-ssh integration test for custom module within SLS 2014-10-17 15:39:49 -07:00
C. R. Oldham
d07ebe2105 Test for retcode 2014-10-14 13:28:19 -06:00
rallytime
f5597010ca Add GPG key file to integration tests 2014-07-31 10:57:49 -06:00
C. R. Oldham
9dc3f696ca Fix two RHEL7 tests 2014-07-24 14:11:03 -07:00
Mike Place
c3d0b5cba5 Dummy file to fix failing tests. 2014-07-01 15:58:01 -06:00
Pedro Algarvio
7bd8b1360f Remove remaining exsel code 2014-05-29 01:32:54 +01:00
Pedro Algarvio
4d7ca91424 Remove unnecessary ©️ and :license: from file headers 2014-05-26 19:26:15 +01:00
Elias Probst
f57dce2224 Correct usage of 'CLI Example' in documentation blocks 
This mass-edit was done using the following shell command:
ack --python -l '^(\s*)CLI Example::$' \
| xargs sed -i \
's/^\(\s*\)CLI Example::/\1CLI Example:\n\n\1.. code-block:: bash/g'
 2014-05-14 19:29:49 +02:00
Pedro Algarvio
33f361e99d Don't use the deprecated keyword argument 2014-04-24 09:06:28 +01:00
Thomas S Hatch
9ed1e172e3 Maybe this will fix the ubuntu tests on jenkins! 2014-04-02 11:02:03 -06:00
Thomas S Hatch
d478a16ef5 These tests should have never worked!! 2014-04-02 10:27:04 -06:00
Thomas S Hatch
94a6b01522 Merge pull request #10011 from makinacorpus/fix10010 
display full jinja traceback when applicable
 2014-01-29 07:41:29 -08:00
Mathieu Le Marec - Pasquet
a6b3bf4167 Lint fix 2014-01-29 02:43:19 +01:00
Mathieu Le Marec - Pasquet
688abda402 display full jinja traceback when applicable 
This fixes #10010
 2014-01-29 02:04:12 +01:00
Mathieu Le Marec - Pasquet
165b5e4af2 Handle better state errors 
This fixes #9983.
 2014-01-28 16:01:34 +01:00
Mike Place
444cae7236 Integration test fix 
* oscodename should not have been removed.
 2013-12-27 13:25:05 -07:00
Mike Place
9a8b9ab49d Fix Ubuntu integration tests. 
Ubuntu changed the name of the software-properties package, breaking tests. Details here: https://bugs.launchpad.net/ubuntu/+source/ubuntu-meta/+bug/439566
 2013-12-27 09:40:07 -07:00
regilero
2e48812cfa Merge remote-tracking branch 'upstream/develop' into mysql_additions 2013-12-12 22:10:50 +01:00
Mike Place
d59d8ecfd7 Fileserver integration testing. 
Finished the roots integration tests for now. Started on GitFS testing.
 2013-12-10 17:45:54 -07:00
regilero
3b14cd7cb4 Merge remote-tracking branch 'upstream/develop' into mysql_additions 2013-12-11 00:56:56 +01:00
Erik Johnson
685d1d36de Fix requisite tests 
Now that state.func_name is invalid in requisites, remove them from this
test.
 2013-12-06 15:16:57 -06:00
regilero
b376d1a82b MySQL States integration module with db tests 2013-12-04 22:33:33 +01:00
Mathieu Le Marec - Pasquet
5f46962e80 pep8 fixes 2013-12-04 00:25:50 +00:00
Mathieu Le Marec - Pasquet
e9246d2a77 Remove bootstrap.py's & adapt tests for zcbuildout module 2013-12-03 17:53:58 +00:00
Mathieu Le Marec - Pasquet
228c987b76 feat: buildout support 
This fixes #8856.
 2013-11-29 18:51:20 +00:00
Erik Johnson
13dbb9efab Simplify jinja syntax for ubuntu pkgrepo test deps 
See the below discussion for more info:

https://github.com/saltstack/salt/pull/8872#discussion-diff-7981734R64
 2013-11-28 12:27:39 -06:00
Erik Johnson
0ffce3ce6d Fix ubuntu deps for pkgrepo integration tests 
This fixes a typo'ed package name, as well as doing logic to determine
the correct package name based on the osrelease.
 2013-11-27 20:01:14 -06:00