valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 17:09:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
84,472 Commits 24 Branches 182 Tags 341 MiB
9db4179462
Commit Graph

87 Commits

Author SHA1 Message Date
Joshua Semar
c56845e904 include mod_opts on tornado application, refactor get_app 2015-04-10 15:06:30 +00: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
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
Pedro Algarvio
1a779fd51c Py3 compatibility fixes 2015-01-30 22:25:05 +00:00
Pedro Algarvio
309876eac1 Py3 compatibility fixes 2015-01-30 22:25:05 +00:00
Pedro Algarvio
60f215f191 Add from __future__ import absolute_import 2015-01-30 22:25:04 +00:00
Mike Place
74501f56ae Fix tornado tests 
The tornado test runner isn't respecting timeouts as it claims it
should in async mode. However, the env variable is working as-described.
 2015-01-12 15:36:34 -07:00
Colton Myers
dc43840cee Merge branch '2014.7' into merge-forward 
Conflicts:
	salt/modules/glusterfs.py
	salt/modules/macports.py
	salt/modules/makeconf.py
	salt/modules/mdadm.py
	salt/modules/smartos_vmadm.py
	salt/modules/zypper.py
	salt/utils/event.py
	tests/integration/netapi/rest_tornado/test_app.py
	tests/unit/netapi/rest_tornado/test_handlers.py
 2014-11-21 12:05:32 -07:00
Thomas Jackson
75bf7bd091 pylint fix 2014-11-20 18:35:41 -08:00
Thomas Jackson
0a1b88e6b5 Change all saltnado asserts to unittest asserts. This way when there is a failure you get nice pretty printouts! 2014-11-20 18:35:41 -08:00
Pedro Algarvio
7b4601219b More import errors disables 2014-11-20 18:57:09 +00:00
Pedro Algarvio
0c50d789b7 The imports actually work so shut up PyLint! 2014-11-20 18:22:19 +00:00
Pedro Algarvio
21da23c070 Fix the class name 2014-11-20 17:35:42 +00:00
Pedro Algarvio
eb4bfbbde4 Remove slash 2014-11-20 17:19:58 +00:00
Pedro Algarvio
5a3fead6de Allow the tests to be properly skipped 2014-11-20 17:16:09 +00:00
Pedro Algarvio
d651788dff Allow the test cases to be properly skipped 2014-11-20 16:40:48 +00:00
Pedro Algarvio
f37495c74f Allow the test case to properly skip on missing tornado package 2014-11-20 16:40:47 +00:00
Pedro Algarvio
2bc6b735ef Use urlencode from six 2014-11-20 16:40:45 +00:00
Pedro Algarvio
0937d2b4e1 Use urlencode from six 2014-11-20 16:40:45 +00:00
Thomas Jackson
e2102fcbc7 Pylint cleanup 2014-11-14 09:15:54 -08:00
Thomas Jackson
6f0552c9e1 Pylint fixes 2014-11-13 09:33:14 -08:00
Thomas Jackson
ebfee14fda Add test for using a Future in multiple "Any" futures 2014-11-13 08:36:28 -08:00
Thomas Jackson
f0f9b14ee2 Add tests for MinionSaltAPIHandler 2014-11-13 08:36:27 -08:00
Thomas Jackson
26afdd34ae Re-factor test cases 2014-11-13 08:36:27 -08:00
Thomas Jackson
4b8ac6a9e3 Add tests for auth handler 
break unit tests for handlers into a separate file
Misc error handling fixes in Login handler
 2014-11-13 08:36:26 -08:00
Thomas Jackson
6245c27391 Add tests for deserialize (and fix a few bugs in there) 
More cleanup of websockets separation
 2014-11-13 08:36:26 -08:00
Thomas Jackson
ecbd269eda Move future testing out of event listener test class 2014-11-13 08:36:26 -08:00
Thomas Jackson
ecefbb91dc Add tests for Any Futures 
move eventlistener callbacks into the class
 2014-11-13 08:36:26 -08:00
Thomas Jackson
3816236e26 Add test for event you don't want 2014-11-13 08:36:26 -08:00
Thomas Jackson
257a73fb69 Add first tests for rest_tornado! 2014-11-13 08:36:26 -08:00
Seth House
66e2b54f36 Added encoding comment to empty init files 2014-06-19 17:37:44 -06:00
Seth House
d00cd104ac And yet more pylint fixes 2014-06-19 17:25:56 -06:00
Pedro Algarvio
7590586d05 Don't fail on missing CherryPy 2014-06-19 13:00:38 +01:00
Seth House
1d4057fadf Updated all saltapi import paths to salt.netapi 2014-06-18 20:56:16 -06:00
Seth House
ea7eccd0ea "serialized" -> "unserialized" 
This was backward.
 2014-03-31 10:15:27 -06:00
Seth House
bb9ff7aa6a First stab at unit tests for the various rest_cherrypy tool functions 2014-03-31 09:59:55 -06:00