Nicole Thomas
94e094652c
Back-port #34324 to 2015.8 ( #34344 )
...
* Add test to match against custom grains
* Lint
* Forgot to add custom grain
2016-06-28 16:35:32 -04:00
Mike Place
9b18f372e6
Normalize IPC check among transports
2015-11-11 16:26:32 -07: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
Thayne Harbaugh
993373655a
Allow grain and pillar delimiter to be specified in compound matcher syntax.
2015-04-23 23:26:49 -06:00
Thayne Harbaugh
d6fe499f55
Allow compound expressions to begin with "not"
2015-04-22 17:38:17 -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
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
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
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
Thayne Harbaugh
a7a33b381c
Various fixes:
...
* Add missing spaces in help
* Correct order of arguments to _check_cache_minions() (not part of pillar_pcre)
* Add platening of pillar_pcre to pillar_exact_minions
* Add missing match to pillar_pcre
* Correct unit test
2015-04-03 18:32:52 -06:00
Thayne Harbaugh
c91392bc91
Add option -J/--pillar-pcre to match on pillar PCREs
2015-04-03 02:47:19 -06:00
Justin Findlay
ebc6a1f4c8
fix matcher tests for 2015.2->develop merge
2015-02-23 15:39:44 -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
Justin Findlay
0d6663b8a8
conform shell integration tests to txt runner
2015-02-17 15:40:17 -07:00
Pedro Algarvio
60f215f191
Add from __future__ import absolute_import
2015-01-30 22:25:04 +00:00
Pedro Algarvio
2d210b9055
Switch open() for salt.utils.fopen()
2014-11-26 18:33:22 +00:00
Aditya Kulkarni
88a873a171
Ensure tests pass on raet and zmq
2014-07-17 10:32:07 -04:00
Aditya Kulkarni
615e0b7550
Add timeouts to wait longer
2014-07-15 16:50:32 -04:00
Aditya Kulkarni
978ae5fb51
Make sure test_grain passes with raet
2014-07-15 16:27:47 -04:00
Pedro Algarvio
762d0b1e24
Check for extra arguments to '--doc' and fail. Fixes #12261 .
2014-04-24 15:42:47 +01:00
Pedro Algarvio
e5b293e767
Remove unused imports
2014-02-08 07:57:10 +00:00
Pedro Algarvio
c6de2adb31
Fix unit test expected results since we now exit with an error code.
2014-01-19 16:16:49 +00:00
Pedro Algarvio
68d7cc074b
exsel matching is no longer supported.
2013-12-17 01:01:49 +00:00
Pedro Algarvio
08c5c8e83a
Fix PyLint W1401, anomalous backslash.
2013-11-27 11:24:26 +00:00
Pedro Algarvio
d02a2bc224
Include the python encoding file header on tests.
2013-11-27 11:19:24 +00:00
Thomas S Hatch
ca0e967c13
Assign the ret value
2013-10-15 17:03:12 -06:00
Pedro Algarvio
e72b4a3492
Fix syslog logic checks for file://, tcp:// and udp://. Fixes #7754 .
2013-10-15 22:09:37 +01:00
Pedro Algarvio
66b6acd0e0
Updated integration.shell.matcher test suite to use salttesting.helpers.ensure_in_syspath()
2013-06-28 00:13:02 +01:00
Pedro Algarvio
222be7b446
Make sure every test module is runnable by __main__.
...
* Double to single quotes
2013-06-28 00:12:56 +01:00
Pedro Algarvio
c0ead8b2dc
Fix a misplaced continue on the grains matching logic which caused a traceback.
...
```
[21:18:46,004 [salt.utils.minions :200 ][ERROR ] Failed matching available minions with grain pattern: planets:saturn
Traceback (most recent call last):
File "/home/ubuntu/salt/salt/utils/minions.py", line 197, in check_minions
}[expr_form](expr)
File "/home/ubuntu/salt/salt/utils/minions.py", line 119, in _check_grain_minions
str(match.lower()),
AttributeError: 'list' object has no attribute 'lower'
```
2013-03-13 01:02:15 +00:00
Thomas S Hatch
d70ecc8387
Update doc test to -d changes
2013-03-11 23:27:18 -06:00
Thomas S Hatch
3d1cf71a77
Combine compound matcher tests
2013-02-08 10:57:20 -07:00
Thomas S Hatch
c5f5bd1e99
Fix tests to better reflect doc matching updates
2013-02-07 15:11:42 -07:00
Thomas S Hatch
a58202c2f7
Add compound matcher tests
2013-01-29 10:20:02 -07:00
Erik Johnson
77eeb47bea
Add tests for nested grain/pillar matching
...
Also added tests for traditional grain matching when target grain is a
list.
2013-01-26 00:13:51 -06:00
Thomas S Hatch
a24ff1852a
remove unused import
2013-01-14 21:50:56 -07:00
Pedro Algarvio
36955b4560
Fix integration.shell.matcher.MatchTest.test_ipcadr.
...
Was skipping because of the latest output changes and how output parsing was done.
2013-01-14 13:04:23 +00:00
Thomas S Hatch
aa1c55f610
Add tests for pillar matching list objects Fix #2761
2012-12-12 16:37:21 -07:00
Pedro Algarvio
152088d727
Include another option into the test_salt_documentation_arguments_not_assumed test.
2012-11-11 20:11:08 +00:00
Pedro Algarvio
527cf4ee38
Don't assume again and expand test.
...
* When introducing the "Don't assume!" changes I also assumed that there were always more than one argument from the shell. Expanded the testcase to include this check.
2012-11-09 11:32:36 +00:00
Pedro Algarvio
75f70e49f3
Include a test case for the previous "Don't assume!" commit.
2012-11-09 11:23:30 +00:00
Pedro Algarvio
cec1cbd477
Fix test if there the host has multiple subnets.
2012-10-07 03:05:00 +01:00
Pedro Algarvio
7e816c291f
Add shell ipcadr match test.
2012-10-06 01:29:24 +01:00
Pedro Algarvio
496906e413
Add exsel shell match test.
...
Although this commit does not exactly reference the problem see on #2167 , it was added while working for that issue.
2012-10-05 07:56:23 +01:00
Pedro Algarvio
8c6b96db59
Support -d on the salt binary. Fixes #1992 .
2012-09-07 19:21:07 +01:00
Pedro Algarvio
b582e40ff1
Cleanup the salt(salt.cli.SaltCMD) binary parser.
...
* Created 2 mix-ins as option groups, the output options and the target options. This will allow adding some explanatory text besides separating these options from the parser's main options.
* All options on the parser, including the grouped options are now merged to the loaded configuration which will latter get passed on.
* Also created the timeout mix-in which will be used in other binaries.
2012-08-04 22:08:06 +01:00
Jeroen Dekkers
a28272e2fb
Fix "undefined name" errors spotted by pyflakes
2012-07-15 03:01:35 +02:00
Intchanter
a1433ef5ec
PEP8 fixes for tests
2012-06-30 14:10:34 -06:00
Thomas S Hatch
d8ca98f3a4
Add test to make sure #1348 does not happen again
2012-05-27 17:41:49 -06:00
