Mike Place
c19782a184
Merge pull request #29853 from basepi/merge-forward-develop
...
Merge forward from 2015.8 to develop
2015-12-22 08:05:49 -07:00
Sergey Kizunov
793c0bef75
Fixed Windows salt-master memory leaks in logger
...
__process_multiprocessing_logging_queue:
- A leak was observed in this process on Windows. On Windows, creating a
new process doesn't fork (copy the parent process image). Due to this, we
need to setup extended logging inside this process. The leak was due to
the temp null and temp logging handlers being active which just store
messages but don't process them. Setting up extended logging removes
those handlers and fixes the leak (as well as properly dealing with
incoming logging messages).
setup_multiprocessing_logging:
- A leak was obversed in processes that used this on Windows. Similar
to above, due to lack of fork, the new process will have the temp null
and temp logging handlers enabled, causing the leak. In this function,
removing those handlers prevents the leak.
Signed-off-by: Sergey Kizunov <sergey.kizunov@ni.com>
2015-12-20 09:05:19 -06:00
Colton Myers
95fe811724
Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop
...
Conflicts:
salt/minion.py
salt/modules/network.py
salt/scripts.py
salt/states/file.py
salt/states/git.py
salt/utils/event.py
2015-12-18 15:00:24 -07: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
83df4c4c75
Skip refresh db test if upstream repo does not repsond.
2015-12-16 10:23:10 -07:00
Craig Rodrigues
381e8cc144
Use print as a function [PEP 3105].
...
This reduces warnings from the 2to3 utility
and future proofs the code when it is time to move to Python 3.
2015-12-04 16:17:35 -08:00
Colton Myers
3f09d58fff
Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop
...
Conflicts:
salt/cloud/clouds/vmware.py
salt/modules/rh_ip.py
salt/modules/s3.py
salt/modules/saltutil.py
salt/modules/zypper.py
salt/spm/__init__.py
salt/utils/aws.py
salt/utils/s3.py
tests/unit/modules/s3_test.py
tests/unit/pydsl_test.py
2015-12-01 15:31:03 -07:00
Mike Place
39667fda12
Merge pull request #29240 from clan/linux_acl
...
handle acl_type [[d]efault:][user|group|mask|other]
2015-12-01 10:56:20 -07:00
Mike Place
7e424e10f2
Merge pull request #28054 from dr4Ke/custom_grains_deep_merge
...
loader uses a deep dictionary merge for the grains (core and customs)
2015-12-01 10:33:52 -07:00
Z. Liu
02429aca69
handle acl_type [[d]efault:][user|group|mask|other]
2015-12-01 14:55:08 +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
2477ff2eab
Add __init__ and pydsl test
2015-11-25 10:50:30 -07:00
Mike Place
063f075a99
Add integration renderer tests to the suite
2015-11-25 10:14:46 -07:00
Colton Myers
28b40de8da
Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop
...
Conflicts:
salt/client/ssh/__init__.py
salt/client/ssh/ssh_py_shim.py
salt/cloud/clouds/ec2.py
salt/cloud/clouds/vmware.py
salt/grains/philips_hue.py
salt/modules/boto_ec2.py
salt/modules/boto_route53.py
salt/modules/dracr.py
salt/modules/philips_hue.py
salt/proxy/philips_hue.py
salt/states/virtualenv_mod.py
2015-11-24 16:07:31 -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
Christophe Drevet-Droguet
89e7578d21
loader test for external grains deep merge (non-functional)
...
This test is disabled until we have a way to reload the minion, or
just the custom grains, with the grains_deep_merge option set.
2015-11-20 08:44:29 +01:00
Mike Place
714ef8ff27
Merge pull request #29057 from lyft/file-manage-local-source-list
...
Add local file support for file.managed source list
2015-11-19 14:57:34 -07:00
justinta89
64a62662ef
Added sys import
2015-11-19 14:42:15 -07:00
Justin Findlay
401e4bfd33
file state: integration test difflib version check
2015-11-19 14:10:29 -07:00
justinta89
f947e1e549
Adjusted the expected output to match the actual results
2015-11-19 11:32:18 -07:00
Paul Fisher
d175061c5d
Add tests for file.source_list with local files
2015-11-18 15:55:44 -08:00
Christophe Drevet-Droguet
f13e9435b1
loader test for custom grains
2015-11-18 22:08:24 +01:00
Mike Place
27b917b623
Adjust tests for new loader spec
2015-11-16 12:23:05 -07: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
785bf94f55
Add transport setting to shell test
2015-11-12 14:32:39 -07:00
Mike Place
8d3244166b
Cast to dict to fix wheel tests in tcp
2015-11-12 12:21:52 -07:00
Mike Place
9b18f372e6
Normalize IPC check among transports
2015-11-11 16:26:32 -07:00
Mike Place
26fd2bc89e
Merge pull request #28215 from s0undt3ch/features/signal-handling
...
Proper signal handling
2015-11-09 12:11:15 -07:00
rallytime
cded9ac01d
Merge branch '2015.8' into 'develop'
...
Conflicts:
- salt/cloud/clouds/vmware.py
- salt/modules/freebsdpkg.py
- salt/modules/virtualenv_mod.py
- salt/states/boto_asg.py
- tests/integration/__init__.py
- tests/runtests.py
2015-11-06 09:34:31 -07:00
Pedro Algarvio
058cd00aea
Name some more runtests daemon processes
2015-11-06 13:15:12 +00:00
Pedro Algarvio
9dc5533fae
Name the test daemon processes for ps output
2015-11-06 13:15:12 +00:00
rallytime
eec9d69387
Merge branch '2015.5' into '2015.8'
...
Conflicts:
salt/modules/virtualenv_mod.py
salt/states/file.py
tests/integration/__init__.py
2015-11-04 15:52:59 -07:00
Mike Place
bdd5274c55
Merge pull request #28505 from plastikos/improvement-minio_process_grains
...
Add grains/minion_process.py - grains describing the minion process
2015-11-04 07:40:05 -07:00
Thayne Harbaugh
3bedbb713b
Use "test.versions" instead of "-g" (pid in grains changes).
...
integration.shell.call.test_issue_15074_output_file_append test just needs any
output that is repeatable. Previously it used the grains output ("-g"
argument). Unfortunately grains now includes the PID which changes for each
invocation of "salt-call" and is therefore not predictably comparable. Use
"test.versions" that should have constant output across multiple invocations.
2015-11-03 14:10:37 -07:00
Thayne Harbaugh
ab09d08c99
Expand test integration.modules.grains to check for new minion process grains.
2015-11-03 00:14:32 -07:00
Colton Myers
32969b2408
Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop
...
Conflicts:
doc/topics/cloud/digitalocean.rst
salt/cloud/clouds/digital_ocean.py
salt/cloud/clouds/linode.py
salt/loader.py
salt/modules/blockdev.py
salt/modules/boto_route53.py
salt/modules/boto_vpc.py
salt/modules/bsd_shadow.py
salt/modules/file.py
salt/modules/rabbitmq.py
salt/modules/schedule.py
salt/modules/win_network.py
salt/runners/state.py
salt/spm/__init__.py
tests/unit/modules/blockdev_test.py
2015-11-02 18:19:01 -07:00
twangboy
cf1e059be5
Fixed windows tests
2015-11-02 16:16:22 -07:00
Colton Myers
3286a5250f
Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8
...
Conflicts:
doc/topics/installation/windows.rst
doc/topics/tutorials/pillar.rst
pkg/windows/installer/Salt-Minion-Setup.nsi
salt/modules/file.py
salt/modules/schedule.py
salt/pillar/git_pillar.py
salt/states/boto_route53.py
salt/states/pkg.py
tests/integration/modules/pillar.py
2015-10-30 16:05:26 -06:00
Kent Shultz
73236b4ea8
commit 7b262f8 missed one fix
2015-10-28 17:18:01 -07:00
Mike Place
e9bdd746ab
Merge pull request #28349 from s0undt3ch/features/signal-handling-from-scratch
...
Proper signal handling - [Different approach]
2015-10-28 11:16:49 -06:00
Pedro Algarvio
7d9e310bc3
Shut up pylint
2015-10-28 14:24:44 +00:00
Pedro Algarvio
7b262f8bf7
Import 'integrations' not 'tests.integrations'
2015-10-28 14:24:44 +00:00
Dmitry Kuzmenko
435e8fc4d9
Fix tests: add module function docstring
2015-10-26 16:07:52 +03:00
Dmitry Kuzmenko
df2b40e854
Fixed @depends integration test
2015-10-26 16:07:52 +03:00
Erik Johnson
0d6a4ac115
Remove non-functional test
...
This test was written using an incorrect assumption that the
pillar_roots key created during git_pillar execution lives any longer
than the run that compiles the git_pillar data for a given git_pillar.
2015-10-24 17:39:16 -05:00
Erik Johnson
86f00e71bf
Remove non-functional test
...
This test was written using an incorrect assumption that the
pillar_roots key created during git_pillar execution lives any longer
than the run that compiles the git_pillar data for a given git_pillar.
2015-10-24 17:36:33 -05:00
Thayne Harbaugh
a584ba567b
Test for loader collisions between modules and packages
...
What gets loaded from the following layout?:
foo.py:bar()
foo/__init__.py:bar()
This used to raise an exception (up until yesterday). For now this ensures
that foo/__init__.py:bar() has higher priority than foo.py:bar() when
foo.bar() is referenced.
2015-10-22 13:49:09 -06:00
