valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 09:23:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
77,707 Commits 24 Branches 182 Tags 341 MiB
b458b89fb8
Commit Graph

70 Commits

Author SHA1 Message Date
rallytime
da811fe505 Skip the correct test for the matcher tests in Arch 
I mixed up the test that was actually failing for Arch. I originally
submitted #41074 to skip the test_salt_documentation test in the
shell matcher tests. This is the wrong test to skip.

I reverted the previous commit, and applied the skipTest to the
correct test that is failing on Arch, which is the
test_salt_documentation_arguments_not_assumed test.
 2017-05-04 14:45:58 -06:00
rallytime
b9d1ce9aed Revert "Skip integration.shell.matcher.MatchTest.test_salt_documentation test for Arch" 
This reverts commit 9eb482d5c7.
 2017-05-04 14:45:38 -06:00
rallytime
9eb482d5c7 Skip integration.shell.matcher.MatchTest.test_salt_documentation test for Arch 
This test is failing in Arch due to a bug in salt-testing. Skipping until
salt-testing can be upgraded. For more information, see
https://github.com/saltstack/salt-jenkins/issues/324.
 2017-05-04 11:26:01 -06:00
rallytime
a782b00ee1 Merge branch '2016.3' into '2016.11' 
Conflicts:
  - salt/cloud/clouds/openstack.py
 2017-02-01 13:35:10 -07:00
Erik Johnson
b4afea2a25 Don't fail test if data is empty 
This keeps trimmed output from failing the test. We are still testing
with a specific module lower down in the test, so this doesn't reduce
our test coverage.
 2017-02-01 00:05:21 -06:00
Pablo Suárez Hernández
4311b0b6de Increasing timeouts for running integrations tests 2017-01-23 16:55:48 +00:00
Mike Place
52e9ba4076 Revert "Skip some tests on MacOS" (#36341) 2016-09-15 11:12:04 -06:00
Justin Findlay
d0c4846c89 skip tests that timeout on MacOS 
Due to the changes in how the test daemons are handled, it seems.  The
tests fail intermittently.
 2016-09-14 14:40:43 -06:00
rallytime
3149da1bcc Merge branch '2015.8' into '2016.3' 
No conflicts.
 2016-06-29 16:16:46 -06:00
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
e81bd6ee94 Test custom grains matcher (#34324) 
* Add test to match against custom grains

* Lint

* Forgot to add custom grain
 2016-06-28 12:17:14 -04:00
Ch3LL
665468b5e8 fix pylint 2016-03-30 10:28:48 -06:00
Ch3LL
1d46f01389 add more comments 2016-03-29 15:13:07 -06:00
Megan Wilhite
f34008988b add more matcher grains tests with wildcard 2016-03-29 19:59:13 +00:00
Colton Myers
efb479a1bd Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 
Conflicts:
    doc/topics/cloud/vmware.rst
    salt/cloud/clouds/vmware.py
    salt/grains/chronos.py
    salt/grains/marathon.py
    salt/loader.py
    salt/modules/chronos.py
    salt/modules/marathon.py
    salt/proxy/chronos.py
    salt/proxy/marathon.py
    salt/state.py
    salt/states/chronos_job.py
    salt/states/marathon_app.py
    salt/states/user.py
    salt/utils/schedule.py
 2015-11-13 15:18:45 -07:00
Mike Place
9b18f372e6 Normalize IPC check among transports 2015-11-11 16:26:32 -07:00
Pedro Algarvio
e7681f7c75 Try to overcome a failure to get cwd in Cent tests 2015-07-28 12:07:04 +01: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