Justin Findlay
6b99798b1e
tests.integration: use system tmpdir on darwin
2016-03-10 10:57:18 -07:00
rallytime
838dc12b77
Merge branch '2015.8' into '2016.3'
...
Conflicts:
- salt/cli/daemons.py
- salt/config/__init__.py
- salt/exceptions.py
- salt/pillar/foreman.py
- salt/returners/local_cache.py
- salt/states/saltmod.py
- salt/utils/__init__.py
- salt/utils/cloud.py
The merge conflicts in salt/cli/daemons.py are still present in this commit.
@s0undt3ch is going to resolve them after this commit.
2016-03-08 10:14:32 -07:00
rallytime
beb9d0fe84
Ensure all integration test classes and funcs are documented w/examples
2016-03-04 12:13:27 -07:00
Justin Findlay
8623c24335
add integration tests for minion blackout
...
Related to #30868 .
2016-02-19 18:04:31 -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
Christophe Drevet-Droguet
f13e9435b1
loader test for custom grains
2015-11-18 22:08:24 +01: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
twangboy
cf1e059be5
Fixed windows tests
2015-11-02 16:16:22 -07:00
Pedro Algarvio
10a9189d83
Merge remote-tracking branch 'upstream/2015.8' into hotfix/merge-forward-develop
2015-09-06 12:42:58 +01:00
Pedro Algarvio
00b9cc9a83
Only place salt's code root dir in sys.path, not anything above that
2015-09-03 10:49:01 +01:00
Erik Johnson
d6b4e8d033
tests/integration/__init__.py: remove raw string formatting
2015-08-26 23:26:07 -05:00
Pedro Algarvio
37924b2843
Shutdown the multiprocessing logging queue listener
2015-08-03 21:37:56 +01:00
Pedro Algarvio
8f3199f933
Make sure the mp logging queue listener is configured
2015-08-03 13:20:08 +01:00
Pedro Algarvio
e7681f7c75
Try to overcome a failure to get cwd in Cent tests
2015-07-28 12:07:04 +01:00
Justin Findlay
146e6e519a
fix transport settings in 3083c71
2015-07-21 16:42:33 -06:00
Justin Findlay
3083c71ec3
add tcp transport opt to test runner
2015-07-20 16:52:48 -06:00
Michael Steed
83a96367a4
Manual merge of #24414 per thatch45
2015-06-06 07:47:52 -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
rallytime
9830708f86
Some small test clean up changes
2015-04-24 16:27:22 -06:00
Thayne Harbaugh
f155daf700
Update time so that minion startup can timeout.
2015-04-23 10:55:42 -06:00
Mike Place
6a11ead5b4
Merge pull request #22453 from jacksontj/transport
...
Abstracted Transport
2015-04-13 09:38:52 -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
Mike Place
f3df92834d
More helper text, refactor filehandles, clean up
2015-04-03 15:34:47 -06:00
Mike Place
baf2c40f88
More helper text, refactor filehandles, clean up
2015-03-13 16:15:23 -06: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
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
Justin Findlay
7c943ec8a7
only add successfully generated ssh keys to config
2015-02-04 16:16:41 -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
ca06f278eb
Py3 compatibility fixes.
2015-01-30 22:25:31 +00:00
Pedro Algarvio
3f24dcfa80
Import six at a later stage
2015-01-30 22:25:07 +00:00
Pedro Algarvio
5bc0c157b6
Py3 compatibility fixes
2015-01-30 22:25:04 +00:00
Pedro Algarvio
60f215f191
Add from __future__ import absolute_import
2015-01-30 22:25:04 +00:00
rallytime
c65d9673a7
Merge branch '2014.7' into merge_forward_fifteen_second_try
...
Conflicts:
salt/states/file.py
2015-01-29 13:42:49 -07:00
Mike Place
7c066c38a0
Increae default runner timeout to 60s
2015-01-28 13:56:41 -07:00
Mike Place
0b38efaaad
Increae default runner timeout to 60s
2015-01-26 10:59:55 -07:00
Pedro Algarvio
c3bc043b23
Merge branch '2015.2' into develop
...
Conflicts:
salt/syspaths.py
setup.py
tests/integration/__init__.py
2015-01-11 22:45:35 +00:00
Pedro Algarvio
9d0fe5b1d1
Merge branch '2014.7' into 2015.2
...
Conflicts:
salt/modules/brew.py
tests/integration/__init__.py
2015-01-11 22:40:16 +00:00
Mike Place
1277b71e2d
Typo
2015-01-09 21:22:40 -07:00
Mike Place
7d4123c6b3
Async flag and test cleanup
2015-01-09 21:21:50 -07:00
Mike Place
7aec24e8e1
Typo
2015-01-09 13:26:25 -07:00
Mike Place
9d7990f264
Async flag and test cleanup
2015-01-09 13:14:33 -07:00
Justin Findlay
751e0c7f43
update color name consistency
2014-12-27 12:20:08 -07:00
