Commit Graph

21 Commits

Author SHA1 Message Date
Mike Place
637c372aae Fix bug with mod_watch in supervisor modules
* Also adds __virtual__ support to supervisord exec module

* Closes #6692

Remove uneeded module.

Don't run supervisord tests without supervisord

Fix state test.

Pulled in an old pylint breakage.

Conflicts:
	salt/modules/saltutil.py
2014-04-23 16:14:12 -06:00
Pedro Algarvio
c8038d87b1 Use KNOWN_BINARY_NAMES from salt.modules.virtualenv 2014-01-11 12:19:29 -07:00
Pedro Algarvio
2cab3227fd The virtualenv binary can have multiple CLI names. 2014-01-02 20:27:18 +00:00
Pedro Algarvio
d02a2bc224 Include the python encoding file header on tests. 2013-11-27 11:19:24 +00:00
Pedro Algarvio
2bdddf2713 33cdd9e remove one of the checks, re-add it. 2013-09-08 12:07:27 +01:00
Pedro Algarvio
a55bc65f66 Check separately, the order can change. 2013-09-05 07:54:03 +01:00
David Boucha
5b76394850 Check for each service status individually
In case they self report out of order
2013-09-04 21:37:26 -06:00
David Boucha
3f1498364d Test service status separately
Sometimes the 2 services return in different orders so we'll test for
each one separately
2013-09-04 15:40:50 -06:00
Thomas S Hatch
33cdd9e760 Don't fail on valid order change 2013-08-13 00:32:32 -06:00
Pedro Algarvio
de41ca3136 Updated integration.modules.supervisord test suite to use salttesting.helpers.ensure_in_syspath() 2013-06-28 00:13:00 +01:00
Pedro Algarvio
b0d9cf18c2 Added support for __main__ execution and formatting fixes. 2013-06-28 00:12:57 +01:00
Ollie Walsh
32b80759d7 Reuse virtualenv for all supervisor tests 2013-05-29 12:54:57 +01:00
Ollie Walsh
1eca34f8e6 Give supervisor a little time to startup during tests 2013-05-29 11:39:09 +01:00
Ollie Walsh
57cba99b06 Supervisor module:
Support running supervisor from a virtualenv/custom path.
Support custom supervisor config file.
Create real tests using a virtual environment.

Supervisor state:
Fix restart when process is already running.
Support restart on watch.
Create real tests using a virtual environment.
2013-05-29 00:18:12 +01:00
Pedro Algarvio
eb38c4de5f Fix supervisor test. 2013-01-23 23:23:05 +00:00
Ramón Cahenzli
a30f2ee244 This root or that root? :) 2012-12-11 16:37:30 +01:00
Scott Walton
9a0fe34e9a Some clean-up, and tests for #962 2012-10-19 16:07:31 +01:00
Pedro Algarvio
6e5fd9e62c Regular users cannot run the supervisor tests. 2012-09-25 22:19:28 +01:00
Scott Walton
c581e7bab5 Added tests, and modified state/modules to pass #2026 2012-09-17 20:34:50 +01:00
Scott Walton
9e35b77038 Added stop and status 2012-09-15 19:02:00 +01:00
Scott Walton
88c04486e4 Added test and code for start #2026 2012-09-15 18:41:01 +01:00