Mike Place
d877f4f775
Merge pull request #23383 from cachedout/remove_overstate
...
Overstate is dead. Long live orchestrate!
2015-06-17 11:14:52 -06:00
Mike Place
dab4eccd00
Remove overstate tests
2015-06-17 11:14:19 -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
5b49e89b43
Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop
2015-06-12 11:42:42 -06:00
Justin Findlay
d88fb22fdc
fix pkg module integration tests on CentOS 5
2015-06-11 14:56:52 -06:00
Justin Findlay
fb91b40ba0
fix pkg module integration tests on ubuntu 12
2015-06-11 12:46:22 -06:00
Michael Steed
83a96367a4
Manual merge of #24414 per thatch45
2015-06-06 07:47:52 -06:00
Colton Myers
baf4337918
Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop
...
Conflicts:
salt/modules/lxc.py
salt/roster/clustershell.py
2015-06-03 13:47:08 -06:00
Justin Findlay
c2db0b1758
fix pkg hold/unhold integration test
2015-06-02 11:56:18 -06:00
Colton Myers
a6a868be6b
Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop
...
Conflicts:
salt/modules/iptables.py
salt/utils/dictupdate.py
2015-06-01 10:29:32 -06:00
Justin Findlay
98944d8c7f
fix pkg test on ubuntu 12.04 for realz
2015-05-31 22:23:17 -06:00
Colton Myers
5fcbcfe6d5
Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop
...
Conflicts:
doc/topics/cloud/digitalocean.rst
doc/topics/tutorials/index.rst
salt/cloud/clouds/digital_ocean.py
salt/modules/lxc.py
salt/returners/__init__.py
2015-05-29 17:33:28 -06:00
Justin Findlay
9508924c02
fix pkg mod integration test on ubuntu 12.04
2015-05-29 15:52:57 -06:00
Colton Myers
c4f5e231fa
Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop2
...
Conflicts:
doc/_themes/saltstack2/layout.html
doc/conf.py
doc/index.rst
doc/ref/modules/all/salt.modules.hipchat.rst
doc/topics/releases/index.rst
salt/client/ssh/client.py
salt/cloud/clouds/vsphere.py
salt/modules/boto_dynamodb.py
salt/modules/boto_route53.py
salt/modules/data.py
salt/modules/http.py
salt/modules/tls.py
salt/output/compact.py
salt/states/boto_elb.py
salt/states/linux_acl.py
salt/states/rabbitmq_user.py
salt/states/win_servermanager.py
salt/utils/dictupdate.py
salt/wheel/config.py
2015-05-29 15:10:13 -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
Justin Findlay
6b6280442c
disable intermittently failing tests
...
This commit is to be reverted when #23623 is merged.
2015-05-28 16:23:57 -06:00
Nicole Thomas
fd41993022
Merge pull request #24157 from basepi/merge-forward-develop
...
Merge forward from 2015.5 to develop
2015-05-27 16:09:00 -06:00
Colton Myers
9dab9a1dda
Fix python3 lint
2015-05-27 13:07:47 -06:00
Colton Myers
60f2e9eefb
Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop
...
Conflicts:
doc/topics/development/contributing.rst
salt/modules/tls.py
2015-05-26 16:38:42 -06:00
Doug Luce
6fe47ea1f4
Allow URL specification of NPM packages
...
If an NPM package was specified as a
url (i.e. git://github.com/Unitech/pm2), the state would crash with an
IndexError. Assume that not every package installed globally is
specified with a URL.
Example failing state:
kvsio:
npm.installed:
- name: git+ssh://github.com/dougluce/kvs.io.git
2015-05-26 13:19:17 -07:00
Thomas S Hatch
9cec5d3dc9
Merge pull request #24088 from jfindlay/pkg_tests
...
pkg module integration tests
2015-05-25 13:39:02 -06:00
Justin Findlay
f1bd5ec404
adding pkg module integration tests
2015-05-23 19:34:37 -06:00
rallytime
7146871d73
Revert "Remove key management test from digital ocean cloud tests"
...
This reverts commit 1d031caa78
2015-05-22 15:33:40 -06:00
Colton Myers
d7362bb5dd
Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop
...
Conflicts:
salt/states/file.py
salt/utils/event.py
2015-05-22 13:02:54 -06:00
rallytime
1d031caa78
Remove key management test from digital ocean cloud tests
...
The create_key function was added to develop, but isn't present in 2015.5.
2015-05-21 13:37:34 -06: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
dce9b540a6
Remove extra line
2015-05-18 14:49:27 -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
Colton Myers
4ea3f8f80a
Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop
...
Conflicts:
salt/pillar/neutron.py
salt/utils/http.py
2015-05-15 13:43:40 -06:00
Justin Findlay
b8867a8c23
update pip tests
2015-05-15 00:15:26 -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
Justin Findlay
9ea2f477b9
more than ZMQ supported for transport, other typos
2015-05-04 23:24:46 -06:00
Justin Findlay
f58f3dac1d
integration test for char escaping in file paths
2015-05-04 23:24:45 -06:00
Colton Myers
befb666623
Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop
...
Conflicts:
salt/modules/mongodb.py
salt/utils/http.py
salt/utils/process.py
tests/integration/__init__.py
2015-04-27 10:28:53 -06:00
Thomas S Hatch
9ca2d58b10
Merge pull request #23058 from plastikos/improvement-compound_as_list
...
[improvement] compound match as list
2015-04-25 10:57:49 -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
rallytime
8d5b50e17c
Don't forget the blank lines at the end of the file
2015-04-24 16:29:51 -06:00
rallytime
9830708f86
Some small test clean up changes
2015-04-24 16:27:22 -06:00
Colton Myers
313c46501d
Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop
...
Conflicts:
salt/auth/pam.py
salt/modules/boto_route53.py
salt/state.py
2015-04-24 10:19:03 -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
Thomas S Hatch
57999117f2
Merge pull request #22969 from plastikos/improvement-leading_not
...
Allow compound expressions to begin with "not"
2015-04-23 21:44:45 -06:00
Thayne Harbaugh
f155daf700
Update time so that minion startup can timeout.
2015-04-23 10:55:42 -06:00
Thayne Harbaugh
d6fe499f55
Allow compound expressions to begin with "not"
2015-04-22 17:38:17 -06: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
Colton Myers
63119f9505
Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2
...
Conflicts:
salt/modules/dockerio.py
salt/modules/localemod.py
salt/modules/useradd.py
2015-04-22 10:51:49 -06:00
Thomas S Hatch
a178d444b8
Merge pull request #22946 from s0undt3ch/2014.7
...
Test with a more recent pip version to avoid a traceback
2015-04-22 10:25:17 -06:00
Pedro Algarvio
bc87749e2c
Test with a more recent pip version to avoid a traceback
...
```
07:39:05,449 [salt.minion :1178][ERROR ] A command in 'pip.list' had a problem: Traceback (most recent call last):
File "/tmp/salt-tests-tmpdir/6833-pip-upgrade-pip/bin/pip", line 9, in <module>
load_entry_point('pip==1.3.1', 'console_scripts', 'pip')()
File "/tmp/salt-tests-tmpdir/6833-pip-upgrade-pip/lib/python2.6/site-packages/pkg_resources/__init__.py", line 546, in load_entry_point
return get_distribution(dist).load_entry_point(group, name)
File "/tmp/salt-tests-tmpdir/6833-pip-upgrade-pip/lib/python2.6/site-packages/pkg_resources/__init__.py", line 2666, in load_entry_point
return ep.load()
File "/tmp/salt-tests-tmpdir/6833-pip-upgrade-pip/lib/python2.6/site-packages/pkg_resources/__init__.py", line 2339, in load
return self.resolve()
File "/tmp/salt-tests-tmpdir/6833-pip-upgrade-pip/lib/python2.6/site-packages/pkg_resources/__init__.py", line 2345, in resolve
module = __import__(self.module_name, fromlist=['__name__'], level=0)
File "/tmp/salt-tests-tmpdir/6833-pip-upgrade-pip/lib/python2.6/site-packages/pip/__init__.py", line 13, in <module>
from pip.commands import commands, get_similar_commands, get_summaries
File "/tmp/salt-tests-tmpdir/6833-pip-upgrade-pip/lib/python2.6/site-packages/pip/commands/__init__.py", line 6, in <module>
from pip.commands.bundle import BundleCommand
File "/tmp/salt-tests-tmpdir/6833-pip-upgrade-pip/lib/python2.6/site-packages/pip/commands/bundle.py", line 5, in <module>
from pip.commands.install import InstallCommand
File "/tmp/salt-tests-tmpdir/6833-pip-upgrade-pip/lib/python2.6/site-packages/pip/commands/install.py", line 5, in <module>
from pip.req import InstallRequirement, RequirementSet, parse_requirements
File "/tmp/salt-tests-tmpdir/6833-pip-upgrade-pip/lib/python2.6/site-packages/pip/req/__init__.py", line 3, in <module>
from .req_install import InstallRequirement
File "/tmp/salt-tests-tmpdir/6833-pip-upgrade-pip/lib/python2.6/site-packages/pip/req/req_install.py", line 20, in <module>
import pip.wheel
File "/tmp/salt-tests-tmpdir/6833-pip-upgrade-pip/lib/python2.6/site-packages/pip/wheel.py", line 23, in <module>
from pip.exceptions import InvalidWheelFilename, UnsupportedWheel
ImportError: cannot import name InvalidWheelFilename
```
2015-04-22 16:13:58 +01:00
Viet Hung Nguyen
b13db32fde
add test for #18843
2015-04-22 16:21:23 +07:00
Thomas Jackson
98af7c3f95
Cleanup jinja attribute access for loader
...
Refactor of #22723
2015-04-21 22:39:17 -07:00
Pedro Algarvio
f7e6f716e3
Make PEP-8 checker happier
2015-04-21 20:35:14 -06:00
Colton Myers
bd6ecdfd43
Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop
...
Conflicts:
doc/topics/installation/windows.rst
doc/topics/tutorials/gitfs.rst
salt/pillar/pepa.py
salt/states/artifactory.py
salt/states/pip_state.py
salt/transport/__init__.py
2015-04-21 10:42:22 -06:00
Colton Myers
92c51affc5
Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2
2015-04-21 10:33:39 -06:00
Pedro Algarvio
ae2bca1f6f
Fix W1504(unidiomatic-typecheck
2015-04-21 14:02:17 +01:00
Justin Findlay
03af523de9
Merge pull request #22853 from s0undt3ch/2014.7
...
Don't assume package installation order.
2015-04-20 20:42:41 -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
Pedro Algarvio
b62df62151
Don't assume package installation order.
...
Additionally pep8 when installed using wheel, reports the version
together with the name.
2015-04-20 14:45:25 +01: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
Justin Findlay
1097d2587a
Merge pull request #22798 from rallytime/pylint-develop
...
Python 3 compat fixes for develop
2015-04-17 13:14:45 -06:00
rallytime
1e4b93dec9
Python 3 compat fixes for develop
2015-04-17 12:00:01 -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
11356cb0c6
Use print_function
2015-04-16 12:16:44 -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
94e4e6bc1e
Merge pull request #22723 from thatch45/lazy_layers
...
Fix the lazy loader to keep a top level key ref
2015-04-16 10:36:26 -06:00
Thomas S Hatch
c003252a8e
Fix test
2015-04-16 09:33:50 -06:00
Thomas S Hatch
f8cdc5060e
fix sysdoc tests for new module level hooks
2015-04-15 19:42:23 -06:00
Thomas S Hatch
586b81b33e
Add tests for the jinja demands
2015-04-15 16:39:08 -06:00
Thomas S Hatch
b626149245
fix tests
2015-04-15 11:59:25 -06:00
Colton Myers
a02ced40f0
Lint
2015-04-14 12:57:25 -06:00
Colton Myers
9099884809
Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2
...
Conflicts:
doc/topics/cloud/config.rst
salt/modules/win_disk.py
salt/modules/yumpkg.py
salt/pillar/s3.py
salt/states/service.py
salt/utils/event.py
tests/integration/netapi/rest_tornado/test_app.py
tests/integration/netapi/test_client.py
tests/unit/states/archive_test.py
2015-04-14 11:03:03 -06:00
Thomas S Hatch
2d9b6eb1e0
Merge pull request #22545 from dmyerscough/digital-ocean-v2-tests
...
Digital Ocean APIv2 Integration Testing
2015-04-13 11:17:20 -06:00
Mike Place
6a11ead5b4
Merge pull request #22453 from jacksontj/transport
...
Abstracted Transport
2015-04-13 09:38:52 -06:00
Colton Myers
5b6d410119
Fix calltest
2015-04-11 15:59:06 -04:00
Colton Myers
99744b9568
Fix lint
2015-04-11 15:56:09 -04:00
Colton Myers
cc8785e980
Fix the test.fib tests
2015-04-11 14:48:59 -04:00
Damian Myerscough
f51fd0349a
Fix pylint error
2015-04-10 23:16:20 -07:00
Damian Myerscough
c6e618bc5f
Digital Ocean APIv2 Integration Testing
2015-04-10 21:30:09 -07:00
Joshua Semar
d9ed9f1e5b
fix linting errors
2015-04-10 16:35:07 +00:00
Joshua Semar
c56845e904
include mod_opts on tornado application, refactor get_app
2015-04-10 15:06:30 +00:00
Thomas Jackson
77395d76d8
Change to sets, we don't gaurantee minion ordering in returns
2015-04-09 09:06:59 -07:00
Thomas Jackson
7614f7ed10
Caste returns to sets, since we don't care about order.
2015-04-09 07:45:24 -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
Pedro Algarvio
35b3cdcc82
Get the first iteration the right way
...
Fixes `TypeError: 'dictionary-valueiterator' object has no attribute '__getitem__'`
2015-04-08 19:43:55 +01:00
Thomas Jackson
d21e180a5a
Fix race condition in integration test startup
2015-04-07 21:01:43 -07:00
Thomas Jackson
064896d4d9
Update commented out version as well
2015-04-07 20:53:20 -07:00
Thomas Jackson
e376b283ef
Refactor the start_daemon function
2015-04-07 20:53:20 -07:00
Thomas Jackson
403c81c2a6
Move daemon init and execution into the same process.
...
These daemon processes aren't all thread safe, so having the test suite init then fork is disingenuous since that isn't supported anyways.
2015-04-07 20:53:20 -07:00
Colton Myers
25f9b2d2d1
Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2
...
Conflicts:
doc/topics/cloud/action.rst
doc/topics/cloud/function.rst
doc/topics/reactor/index.rst
2015-04-07 10:05:35 -06:00
Thomas S Hatch
80a194bc20
Merge pull request #22401 from jfindlay/api_tests
...
sort integration test minion return lists
2015-04-07 09:15:44 -06:00
Thomas S Hatch
234cb65a23
Merge pull request #22319 from plastikos/improvement-pillar_pcre
...
Improvement: add pillar PCRE matching
2015-04-07 09:09:49 -06:00
Justin Findlay
fceb83bf16
sort integration test minion return lists
2015-04-06 22:07:56 -06:00
Justin Findlay
56364ff571
adding cmd.run state integration tests
2015-04-06 20:32:22 -06:00
Mike Place
ce0fb585de
Merge pull request #22344 from jfindlay/bp-21652
...
Backport #21652 from develop to 2015.2
2015-04-06 11:25:26 -06:00
Pedro Algarvio
ff4aa5b989
Include unless in the state internal keywords.
...
Fixes #22359
2015-04-05 01:00:08 +01: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
Justin Findlay
fb8b1858a7
shell {en|dis}abled tests for cmdline, templates
2015-04-03 18:08:13 -06:00
Mike Place
f3df92834d
More helper text, refactor filehandles, clean up
2015-04-03 15:34:47 -06:00
Mike Place
018400d94c
Remove loop interval setting, was causing cpus to spin
2015-04-03 15:34:47 -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
a927087f64
debug rest_tornado test error
2015-04-02 09:05:48 -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
Thomas S Hatch
8ec0c820a6
Merge pull request #22253 from rallytime/merge-22246
...
Merge #22246 with pylint fix and test cleanup
2015-04-01 13:03:27 -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
ed51f2bb7c
Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2
2015-03-31 11:25:27 -06:00
Joshua Semar
a5b28ad24d
fix tests return value
2015-03-30 16:42:19 -05:00
Joshua Semar
95aa3518d5
fix cas behavior on data module
...
data.cas was not saving changes. We now call dump after
receiving the change
2015-03-30 16:01:28 -05:00
Colton Myers
c91a593507
Fix test to give more data on failure
2015-03-27 16:50:39 -06:00
Colton Myers
3c5f9af2d4
Lint (blank lines)
2015-03-21 15:36:04 -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
d82d7645c9
Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop
...
Conflicts:
salt/modules/cmdmod.py
salt/modules/debian_ip.py
salt/modules/drac.py
salt/modules/rpm.py
salt/returners/postgres_local_cache.py
2015-03-19 16:13:16 -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
Thomas S Hatch
55a35c809d
Merge pull request #21755 from jacksontj/2014.7
...
Add timeout to saltnado's event listener
2015-03-18 11:49:38 -06:00
Thomas Jackson
234d02b218
Add timeout to saltnado's event listener
...
Fixes #21707
The issue is basically that the master has seen N minions-- and not all N are currently connected. The publish job returns to the salt-api that N minions got the job-- and it dutifilly waits for all the returns. With this we use the same ping timeout that the CLI does while waiting for returns. So once all minions are no longer running the job we will return.
2015-03-18 08:09:41 -07:00
Thomas Jackson
205787c256
Add timeout to saltnado's event listener
...
Fixes #21707
The issue is basically that the master has seen N minions-- and not all N are currently connected. The publish job returns to the salt-api that N minions got the job-- and it dutifilly waits for all the returns. With this we use the same ping timeout that the CLI does while waiting for returns. So once all minions are no longer running the job we will return.
2015-03-17 19:17:32 -07:00
Justin Findlay
f735f0b96d
add eauth pam group tests
...
Adds test for #17380 .
2015-03-17 14:25:57 -06:00
Mike Place
baf2c40f88
More helper text, refactor filehandles, clean up
2015-03-13 16:15:23 -06:00
Mike Place
d04062a5ad
Remove loop interval setting, was causing cpus to spin
2015-03-13 16:00:32 -06:00
Colton Myers
bdfdd3f232
Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2
...
Conflicts:
salt/modules/virt.py
2015-03-11 16:09:57 -06:00
Thomas S Hatch
13b7046227
Merge pull request #21461 from jfindlay/refactor_crons
...
Refactor unix crons
2015-03-11 09:52:28 -06:00
Erik Johnson
d25677e954
Merge branch '2015.2' into 2015.2-develop
2015-03-10 17:47:30 -05:00
Justin Findlay
5dc09e7da1
update cron and cmd tests for cron runas changes
2015-03-10 15:57:24 -06:00
Erik Johnson
d71e9de859
Fix test_envs fileserver runner test
...
The change in runner output behavior caused the output of test_envs to
change, causing some changes to need to be made in da163471
2015-03-10 11:28:59 -05:00
Vincent Desjardins
d5293901bc
fixes #20198 : virt.get_graphics and virt.get_nics calls in module virt
2015-03-10 09:17:48 -06:00
Vincent Desjardins
7e517a6a5a
fixes #20198 : virt.get_graphics and virt.get_nics calls in module virt
2015-03-09 22:10:38 -04: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
Colton Myers
8c1fa5358e
Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2
...
Conflicts:
salt/modules/debian_ip.py
salt/modules/file.py
salt/states/ssh_auth.py
salt/utils/cloud.py
2015-03-09 11:50:21 -06:00
Thomas S Hatch
0da8878b90
lint
2015-03-09 11:02:25 -06:00
Thomas S Hatch
d789f263c4
Merge branch 'cloud-gce-tests' of https://github.com/junckritter/salt into junckritter-cloud-gce-tests
2015-03-09 11:00:10 -06:00
Tomas Sirny
daf06c1ab6
Credit for test
2015-03-09 09:38:29 +01: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
Viet Hung Nguyen
2a845989b7
bugfix: fix test mode in ssh_known_hosts
...
- present func: should not require key/fingerprint.
In normal mode, key AND fingerprint can be omitted but
test mode requires them, so fix the test mode to behave same
way.
- absent function: return correct ret when change suppose to be made.
- refactor a bit.
2015-03-07 00:58:32 +07:00
Thomas Jackson
9fa37fd46b
Add raw boolean support to depends decorator
2015-03-05 21:59:10 -08:00
rallytime
d9d30cc855
Pylint fix
2015-03-05 10:31:13 -07:00
rallytime
dbdc12fe11
Python 3 compat for joyent integration test file
2015-03-04 16:11:45 -07:00
Justin Findlay
cfd03959d5
fix develop lint
2015-03-03 23:28:56 -07:00
Erik Johnson
0a077c14e3
Update test_valid_docs for nspawn compatibility funcs
2015-03-03 10:10:50 -07:00
Thomas S Hatch
17a76a8e86
Merge pull request #21083 from cachedout/request_test
...
Fix error in state.request
2015-03-03 10:00:14 -07:00
Justin Findlay
a6b86ef627
indent quoted code in cmdmod tests
2015-03-02 16:08:49 -07: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
Erik Johnson
5573b18624
Fix more py3-incompatible print statements
2015-02-28 12:15:16 -06:00
Erik Johnson
93e1805c14
Lint fix
2015-02-28 12:13:41 -06:00
Erik Johnson
84de5b23af
Merge pull request #21160 from terminalmage/lint-2015.2
...
Don't use print statement without parenthesis (py3 compat)
2015-02-28 11:49:13 -06:00
Erik Johnson
afb8439c1f
update test_valid_docs
2015-02-28 11:47:12 -06:00
Erik Johnson
86937eedc4
Don't use print statement without parenthesis (py3 compat)
...
This backports a lint fix from #21158 into the tests for 2015.2.
2015-02-28 11:41:51 -06:00
C. R. Oldham
1ff3192c20
Fileserver lists return lists
2015-02-27 17:24:25 -07:00
Justin Findlay
17b8f73f1b
add cmd module integration tests
2015-02-27 16:30:05 -07:00
Justin Findlay
3397dc5540
fix state request tests
2015-02-27 16:15:26 -07:00
Mike Place
14592ed1f9
Adjust batch test
2015-02-27 14:53:58 -07:00
rallytime
eceadb82b1
Move tearDown functionality into test_instance
...
The new functions don't need to perform the tearDown behavior,
so that insurance should just be moved the function that needs it.
2015-02-27 14:53:54 -07:00
rallytime
14f4d28cd6
Add some more tests to catch API changes for digital ocean
2015-02-27 14:53:54 -07:00
Justin Findlay
68f06aae51
add integration test for #18317
2015-02-27 14:53:53 -07:00
Justin Findlay
3b7ba92089
adding cmd.run integration tests
2015-02-27 14:53:53 -07:00
Nicole Thomas
c2ca579906
Merge pull request #20965 from rallytime/joyent_cloud_tests
...
Add Joyent cloud provider tests
2015-02-27 14:42:08 -07:00
Pedro Algarvio
62f868a076
Merge branch '2015.2' into develop
2015-02-27 10:02:47 +00:00
Pedro Algarvio
38ddbbc227
Fix imports
2015-02-26 09:41:22 +00:00
Thomas S Hatch
87c6e0cbe9
Merge pull request #21023 from rallytime/bp-19303
...
Backport #19303 to 2014.7
2015-02-25 18:07:00 -07:00
Justin Findlay
581247f4b5
fix ssh test error
...
introduced by #21006
2015-02-25 15:27:03 -07:00
Mike Place
90eb36eba6
Merge pull request #20992 from jfindlay/pub_args
...
fix arg preparation for publish module
2015-02-25 09:39:33 -07:00
Mike Place
011f8c4e72
Adjust batch test
2015-02-25 09:32:03 -07:00
rallytime
e5c4cf8ab4
Move tearDown functionality into test_instance
...
The new functions don't need to perform the tearDown behavior,
so that insurance should just be moved the function that needs it.
2015-02-24 16:42:00 -07:00
rallytime
b2bc55f150
Add some more tests to catch API changes for digital ocean
2015-02-24 16:33:31 -07:00
Justin Findlay
5dace8f688
add integration test for #18317
2015-02-24 16:25:57 -07:00
rallytime
95d4fb801c
Skip the ec2 nightly cloud tests for now
...
Something fundamental has changed with the way ec2 interacts with
the test runner starting in 2015.2 (and consequentially develop).
Let's skip these tests for now until we can pin down why so we don't
muddy the cloud-testing waters.
2015-02-24 16:07:23 -07:00
rallytime
e26cac4599
Pylint fix
2015-02-24 10:58:39 -07:00
jfindlay
a38c17efde
Merge pull request #20901 from aspyatkin/feature-bower
...
Add Bower execution and state modules
2015-02-23 21:40:10 -07:00
Justin Findlay
5ab5380094
adding cmd.run integration tests
2015-02-23 16:35:07 -07: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
Alexander Pyatkin
5edb6cba11
Implement Bower state module
2015-02-21 05:57:54 +00: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
jfindlay
ca79845b2f
Merge pull request #20848 from rallytime/new_requisites_tests
...
Integration tests for the new requisites added in 2014.7
2015-02-19 18:29:00 -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
0d6663b8a8
conform shell integration tests to txt runner
2015-02-17 15:40:17 -07:00
Justin Findlay
b39f962369
add state module requested state run tests
...
closes #16901
2015-02-17 14:23:14 -07:00
Dennis Hall
478f42d9b2
Change Github to GitHub
2015-02-15 15:19:54 +01:00
jfindlay
26a0afdf57
Merge pull request #20661 from jacksontj/2015.2
...
2015.2
2015-02-13 08:49:59 -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
Nicole Thomas
f82183d13d
Merge pull request #19235 from terminalmage/lxc-refactor
...
LXC Refactor
2015-02-12 17:16:52 -07:00
Colton Myers
b2a80b195e
Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2
2015-02-12 11:44:57 -07:00
rallytime
cffbca44b6
Pylint fix - remove unused import
2015-02-11 09:35:04 -07:00
rallytime
533adca23a
Merge branch '2014.7' into merge_forward_15
2015-02-11 08:48:14 -07:00
Mike Place
194ad0f8b1
Last time with find removed
2015-02-11 08:45:37 -07:00
jfindlay
a4572f34f3
Merge pull request #20578 from rallytime/bp-20561
...
Backport #20561 to 2014.7
2015-02-10 20:51:23 -07:00
Mike Place
c41998cc4f
Remove another test.
2015-02-10 17:12:31 -07:00
Mike Place
836b525779
Disable gitfs test that does not produce valuable data
2015-02-10 17:11:04 -07:00
Mike Place
c5081179ef
gitfs test lint fix
2015-02-10 14:57:28 -07:00
Erik Johnson
706ce858b4
Disable LXC integration tests for now
2015-02-10 15:06:47 -06:00
Erik Johnson
f18a23c284
Ignore lack of CLI example in deprecated function
2015-02-10 15:06:47 -06:00
Mike Place
78309a0e2d
Last time with find removed
2015-02-10 13:40:33 -07:00
Mike Place
dbd74fbeee
Remove another test.
2015-02-10 11:54:16 -07:00
Mike Place
1e14c9d097
Disable gitfs test that does not produce valuable data
2015-02-10 10:06:01 -07: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
fb0d46f445
Pylint
2015-02-07 11:59:03 -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
e1f8ea650f
Remove grains outputter
...
Its been broken for ~8 months (or more), and its been falling back to nested. Since nested does (IMO) a better job displaying the data and is generic, there is no reason to get this working-- esp since we've already "deprecated" it, by it not working
Conflicts:
salt/output/grains.py
Conflicts:
salt/output/grains.py
2015-02-07 11:57:14 -08:00
Thomas Jackson
02e219e452
Pack modules to runners
2015-02-07 11:54:39 -08:00
jfindlay
4afaccf6b1
Merge pull request #20482 from basepi/merge-forward-develop
...
Merge forward from 2015.2 to develop
2015-02-06 16:59:27 -07:00
Colton Myers
244c916b10
Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop
...
Conflicts:
salt/modules/cron.py
salt/states/npm.py
2015-02-06 15:41:21 -07: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
Colton Myers
56520f4ac9
Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2
...
Conflicts:
conf/minion
salt/modules/cron.py
salt/modules/pip.py
salt/modules/tls.py
2015-02-06 13:00:14 -07: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
f01a5c5fbd
Pylint
2015-02-05 12:17:48 -08: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
b23a076e11
Remove grains outputter
...
Its been broken for ~8 months (or more), and its been falling back to nested. Since nested does (IMO) a better job displaying the data and is generic, there is no reason to get this working-- esp since we've already "deprecated" it, by it not working
Conflicts:
salt/output/grains.py
2015-02-05 09:20:29 -08:00
Thomas Jackson
509b4352f2
Pack modules to runners
2015-02-05 09:20:27 -08:00
Justin Findlay
7c943ec8a7
only add successfully generated ssh keys to config
2015-02-04 16:16:41 -07:00
rallytime
759ce02829
Pylint fix for 2015.2
2015-02-03 10:02:05 -07:00
Mike Place
68418d79a7
Typo
2015-02-02 13:52:26 -07:00
Mike Place
5291cf7809
Better detection for minimum pyzmq version
2015-02-02 13:52:26 -07:00
Thomas S Hatch
cefb78efe9
Merge pull request #17883 from s0undt3ch/features/pylint-py3-modernize
...
[Don't merge yet] Py3 compat changes & Update pylintrc to load the py3modernize plugin
2015-01-31 03:13:53 -07:00
rallytime
310e9075bf
Pylint disable StrictVersion import error
2015-01-30 17:32:17 -07:00
Mike Place
710bb63103
Typo
2015-01-30 16:02:56 -07:00
Mike Place
69c5e1f904
Better detection for minimum pyzmq version
2015-01-30 16:01:59 -07:00
Pedro Algarvio
34c75b1a8d
The dictionary changes while iterating. Run over a list of keys.
2015-01-30 22:27:14 +00:00
Pedro Algarvio
ac15f12349
Py3 compatibility
2015-01-30 22:27:10 +00:00
Pedro Algarvio
4a25daa211
Py3 compatibility
2015-01-30 22:27:10 +00:00
Pedro Algarvio
ff636249f4
Py3 compatibility
2015-01-30 22:27:10 +00:00
Pedro Algarvio
6b0c88e3bf
Py3 compatibility
2015-01-30 22:27:05 +00:00
