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
79,308 Commits 24 Branches 182 Tags 341 MiB
992a8c7294
Commit Graph

9325 Commits

Author SHA1 Message Date
Pedro Algarvio
992a8c7294
Don't hardcode the webserver port number 2017-03-11 16:00:28 +00:00
rallytime
9ddf032e8e Merge branch '2016.11' into 'develop' 
Conflicts:
  - doc/ref/configuration/minion.rst
  - salt/beacons/status.py
  - salt/modules/saltutil.py
  - salt/utils/schedule.py
  - tests/integration/modules/test_beacons.py
  - tests/unit/beacons/inotify_beacon_test.py
 2017-03-10 14:57:31 -07:00
Silvio Moioli
83c93d1268
minionswarm.py: allow random UUID 2017-03-10 12:10:21 +01:00
Mike Place
bbf4eacbba Merge pull request #39930 from s0undt3ch/features/py3 
Moar Py3 and a fix for #38121
 2017-03-09 17:25:01 -07:00
Mike Place
899e037f0a Merge pull request #39932 from rallytime/cp-beacon-fixes 
Cherry-pick the beacon fixes made in #39930 to 2016.11
 2017-03-09 17:21:08 -07:00
Nicole Thomas
c2d4d17589 Merge pull request #39770 from rallytime/merge-2016.11 
[2016.11] Merge forward from 2016.3 to 2016.11
 2017-03-09 15:00:17 -07:00
rallytime
4a52cca926 Pylint fixes 2017-03-09 14:55:33 -07:00
Pedro Algarvio
4627c4ea6d Code cleanup and make sure the beacons config file is deleted after testing 
Conflicts:
  - tests/integration/modules/beacons.py
 2017-03-09 13:35:16 -07:00
Pedro Algarvio
be06df9b64 Remove *args, **kwargs. Not needed, not useful. 2017-03-09 13:11:07 -07:00
Pedro Algarvio
4a242829ee These tests aren't even using mock! 
Conflicts:
  - tests/unit/beacons/inotify_beacon_test.py
 2017-03-09 13:10:43 -07:00
Pedro Algarvio
6408b123e7 These tests are not destructive 
Conflicts:
  - tests/unit/beacons/inotify_beacon_test.py
 2017-03-09 13:09:32 -07:00
rallytime
e7fa367548 [develop] Fix pylint error 2017-03-09 13:04:51 -07:00
Pedro Algarvio
50e51b5b9d The beacons configuration is now a list. Handle it! 2017-03-09 13:00:41 -07:00
Pedro Algarvio
8f5fc49fcc
Add test case for the status beacon. Refs #38121 
Tests proper handling of both the old configuration format and the new one
 2017-03-09 19:33:13 +00:00
Pedro Algarvio
0cb46f0eb8
Several enhancements to the mocked loader module mixin 
Allows patching more than one loader module.
Allows auto-loading the minion functions which will get namespaced with
the globals used to patch the loader module(s).
 2017-03-09 19:31:15 +00:00
Pedro Algarvio
d56d6059f0
Remove *args, **kwargs. Not needed, not useful. 2017-03-09 19:31:14 +00:00
Pedro Algarvio
17c9490a45
These tests aren't even using mock! 2017-03-09 19:31:14 +00:00
Pedro Algarvio
38ceeb6f19
These tests are not destructive 2017-03-09 19:31:13 +00:00
Pedro Algarvio
680bbec79f
The beacons configuration is now a list. Handle it! 2017-03-09 19:31:13 +00:00
Pedro Algarvio
dd53f055b9
Code cleanup and make sure the beacons config file is deleted after testing 2017-03-09 19:29:16 +00:00
Pedro Algarvio
a429b652dc
Proxy the .fileno() method. 
This avoids tracebacks when daemonizing code which is running under the XMLRunner:
```
23:22:46 Traceback (most recent call last):
23:22:47   File "/testing/salt/utils/process.py", line 644, in _run
23:22:47     return self._original_run()
23:22:47   File "/usr/lib64/python3.4/multiprocessing/process.py", line 93, in run
23:22:47     self._target(*self._args, **self._kwargs)
23:22:47   File "/testing/salt/client/mixins.py", line 464, in _proc_function
23:22:47     salt.utils.daemonize()
23:22:47   File "/testing/salt/utils/__init__.py", line 502, in daemonize
23:22:47     os.dup2(dev_null.fileno(), sys.stdout.fileno())
23:22:47 io.UnsupportedOperation: fileno
23:22:47 Process SignalHandlingMultiprocessingProcess-2:
23:22:47 Traceback (most recent call last):
23:22:47   File "/usr/lib64/python3.4/multiprocessing/process.py", line 254, in _bootstrap
23:22:47     self.run()
23:22:47   File "/testing/salt/utils/process.py", line 644, in _run
23:22:47     return self._original_run()
23:22:47   File "/usr/lib64/python3.4/multiprocessing/process.py", line 93, in run
23:22:47     self._target(*self._args, **self._kwargs)
23:22:47   File "/testing/salt/client/mixins.py", line 464, in _proc_function
23:22:47     salt.utils.daemonize()
23:22:47   File "/testing/salt/utils/__init__.py", line 502, in daemonize
23:22:47     os.dup2(dev_null.fileno(), sys.stdout.fileno())
23:22:47 io.UnsupportedOperation: fileno
```
 2017-03-09 19:29:16 +00:00
Pedro Algarvio
42065350f1
Catch and handle tornado.iostream.StreamClosedError exceptions 2017-03-09 19:29:16 +00:00
Nicole Thomas
2f0f7cd224 Merge pull request #39897 from rallytime/merge-develop 
[develop] Merge forward from 2016.11 to develop
 2017-03-09 09:03:46 -07:00
Pedro Algarvio
50e49f1353 Merge pull request #39907 from gtmanfred/listen 
Move stuff to make it available for salt-ssh
 2017-03-09 09:33:46 +00:00
Daniel Wallace
587b7fc7f3 fix test 2017-03-08 18:53:19 -06:00
rallytime
c6cfac7678 Pylint fix 2017-03-08 16:24:03 -07:00
Pedro Algarvio
51c5558b32
This should no longer hang 2017-03-08 20:43:36 +00:00
Pedro Algarvio
0b41b92d7d
Use salt.utils.versions instead of distutils.version 2017-03-08 19:22:33 +00:00
Pedro Algarvio
0a66eac8ad
Ditch initial double forward slashes 2017-03-08 18:34:35 +00:00
Pedro Algarvio
af7de9f0ea
One more attribute to clean up 2017-03-08 18:34:35 +00:00
Pedro Algarvio
06c063a609
Test assertion cannot be done in the callback context 2017-03-08 18:34:34 +00:00
Pedro Algarvio
c09f5e49ff
Absolute paths 2017-03-08 18:34:34 +00:00
Pedro Algarvio
b58241648a
Use the tests support paths module 2017-03-08 18:34:34 +00:00
Pedro Algarvio
36b18864e5
Reuse the existing tests support paths module 2017-03-08 18:34:34 +00:00
Pedro Algarvio
70c0a10666
Properly handle bytes 2017-03-08 18:34:33 +00:00
Pedro Algarvio
ff3faf56fb
Catch AttributeError 2017-03-08 18:34:33 +00:00
Pedro Algarvio
7fffd93b50
Don't pollute the repo tests state tree 2017-03-08 18:34:33 +00:00
Pedro Algarvio
df942bc082
Add a repeat decorator to retry passing tests N times until it fails 2017-03-08 18:34:33 +00:00
Pedro Algarvio
b391a4eb5b
Supervisord does not work under Python 3 2017-03-08 18:34:33 +00:00
Pedro Algarvio
e2e303e724
Minor changes to paths 2017-03-08 18:34:32 +00:00
Pedro Algarvio
712b81e0c1
supervisor does not run against py3. Use pep8 for the tests. 2017-03-08 18:34:32 +00:00
Pedro Algarvio
07d0a5ed20
Cleanup after ourselves 2017-03-08 18:34:32 +00:00
Pedro Algarvio
ad4430249f
Don't complain about basic python types 2017-03-08 18:34:31 +00:00
Pedro Algarvio
c436d9f2f6
This no longer applies. 2017-03-08 18:34:31 +00:00
rallytime
4fc9b5484b Merge branch '2016.11' into 'develop' 
Conflicts:
  - salt/client/ssh/__init__.py
  - salt/pillar/makostack.py
  - tests/integration/client/test_runner.py
  - tests/integration/states/test_file.py
 2017-03-08 09:04:26 -07:00
Pedro Algarvio
0604fdeb8b
Don't warn if the attributes are set to None 2017-03-07 12:23:17 +00:00
Pedro Algarvio
3aa54e6e0e
Clean up after ourselves 2017-03-07 12:23:17 +00:00
Pedro Algarvio
46ba8704cd
Default to showing CPU and MEM, and optionally zombies 2017-03-07 12:23:17 +00:00
Pedro Algarvio
06c77b00d8
Also make sure we cleanup any setUpClass left over attributes 2017-03-07 12:23:17 +00:00
Pedro Algarvio
fd7d665f67
Enable SHOW_PROC just to get some insight. This will be removed before merge. 2017-03-07 12:23:16 +00:00