Commit Graph

273 Commits

Author SHA1 Message Date
Erik Johnson
ef14956db0 Integration test for #30820 2016-02-02 15:34:19 -06:00
Thomas S Hatch
ab61f78295 Merge pull request #29775 from lyft/listen-id-declaration-resolution-stable
Change listen requisite resolution from name to ID declaration
2015-12-16 15:56:03 -07:00
Paul Fisher
ff3a809c11 Change listen requisite resolution from name to ID declaration 2015-12-16 13:54:49 -08:00
Mike Place
d651d7167e Merge pull request #29067 from jacksontj/2015.8
Fix infinite recursion in state compiler for prereq of SLSs
2015-11-30 13:27:09 -07:00
Mike Place
81bf332be4 Migrate pydsl tests to integration test suite
This marks the beginning of a migration of the pydsl renderer tests
to the integration test suite and away from the unit test suite.

The unit test approach is becoming too difficult to maintain due to its complex approach to trying to internally manage a highstate run instead of calling into the salt state system to fully manage it.
2015-11-24 15:46:14 -07:00
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
Weilu Jia
64e439cda2 Add test for infinite recursion with sls prerequisites 2015-11-23 09:12:06 -08:00
justinta89
d88ac2589f Changed grain to look at osmajorrelease instead of osrelease 2015-10-14 10:42:55 -06:00
rallytime
e14931ff2d Also add -Z to script args for cloud tests 2015-08-24 16:11:01 -06:00
rallytime
0d6eebf3c3 Extra lines 2015-08-24 15:12:31 -06:00
rallytime
c69c918b46 Add script_args: '-P' to Ubuntu 14 profiles for nightly cloud tests 2015-08-24 15:12:25 -06:00
rallytime
b68e3c0d0c Update the Azure Cloud Provider tests to be more acurate and use newer azure SDK version 2015-06-25 15:14:21 -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
rallytime
7ed776c293 Cloud tests should use an image that is LTS
Changes the test image to create for digital ocean cloud tests to be on Ubuntu 14.04, not 14.10
2015-05-18 14:04:24 -06:00
rallytime
4acf58e758 Switch digital ocean tests to v2 driver
This has been done on develop, but this handles the cloud test failures for 2015.5.
2015-05-18 13:44:08 -06:00
rallytime
7e15ff94ff Move digital_ocean_v2 tests to be the defauly/only tests for digital ocean cloud tests 2015-05-14 15:25:00 -06:00
Thayne Harbaugh
6f4cfd01fc Specify compound matches as lists
Compound matches, such as nodegroups, can now be specified as lists.  This
avoids splitting on whitespace which may be part of a key or value.

Right now this only works for nodegroups.  Making the argument to "-C"
(compound list) a JSON argument is a future task.
2015-04-24 17:00:04 -06:00
Colton Myers
ef583295d5 Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop
Conflicts:
    salt/beacons/service.py
2015-04-20 11:41:25 -06:00
Thomas S Hatch
a7ff60491b Merge pull request #22815 from plastikos/issue-22797
Fix failure with nested nodegroups:
2015-04-20 09:12:54 -06:00
Thayne Harbaugh
b37b6b2849 Add a test for incorrectly-nested nodegroups that cause a resolution loop. 2015-04-17 17:01:47 -06:00
Thayne Harbaugh
6c1d4d58e9 Fix failure with nested nodegroups:
If a nodegroup was re-used - even if it wasn't a circular reference - it
would fail the nodegroup expansion with the following message:

    Failed nodegroup expansion: illegal nested nodegroup "min"

This was simply because already-visited nodegroups are pushed into `skip`
but were never popped.

   * Add another test case for this situation.
   * Pop the current nodegroup from `skip` when leaving the expansion
     context

Fixes: #22797
2015-04-17 15:20:34 -06:00
Tomas Sirny
42d26cc699 Shorter disk resource definition 2015-04-17 16:30:06 +02:00
Tomas Sirny
5d93b7619d Working test for extended profile 2015-04-17 15:40:08 +02:00
Tomas Sirny
6f34f0db74 Allow setting multiple disks and scopes on create of instance for GCE 2015-04-17 15:40:08 +02: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
Damian Myerscough
c6e618bc5f Digital Ocean APIv2 Integration Testing 2015-04-10 21:30:09 -07:00
Thayne Harbaugh
1c3536fb8e Support nested nodegroups
Nodegroups can be recursively expanded without worrying about other
compound matcher expansions.  Once the nodegroups are expanded on the
master the remaining flattened compound match can be expanded without the
nodegroup information.
2015-04-08 23:16:39 -06:00
Mike Place
018400d94c Remove loop interval setting, was causing cpus to spin 2015-04-03 15:34:47 -06:00
Colton Myers
70406867a4 Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop
Conflicts:
    salt/client/__init__.py
    salt/modules/file.py
    salt/modules/yumpkg.py
    salt/modules/zypper.py
    tests/integration/shell/auth.py
    tests/unit/states/archive_test.py
    tests/unit/states/module_test.py
2015-03-20 20:09:19 -06:00
Colton Myers
2b1f400ab4 Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2
Conflicts:
    doc/topics/topology/syndic.rst
    salt/client/__init__.py
    salt/daemons/masterapi.py
    salt/minion.py
    salt/modules/dockerio.py
2015-03-19 16:03:29 -06:00
Justin Findlay
f735f0b96d add eauth pam group tests
Adds test for #17380.
2015-03-17 14:25:57 -06:00
Mike Place
d04062a5ad Remove loop interval setting, was causing cpus to spin 2015-03-13 16:00:32 -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
Tomas Sirny
494d7069fd Working basic test for GCE cloud provider 2015-03-08 23:16:36 +01:00
Tomas Sirny
ee00477bae Template configs for GCE cloud provider 2015-03-08 16:44:14 +01: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
Erik Johnson
94d55889d7 Resolve merge conflicts 2015-02-28 12:35:25 -06: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
rallytime
b51492486f Add Joyent cloud provider tests 2015-02-20 17:25:07 -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