Merge pull request #37229 from rallytime/merge-carbon

[carbon] Merge forward from 2016.3 to carbon

salt/minion.py

@@ -766,6 +766,11 @@ class MinionManager(MinionBase):
         if HAS_ZMQ:
             zmq.eventloop.ioloop.install()
         self.io_loop = LOOP_CLASS.current()
+        self.process_manager = ProcessManager(name='MultiMinionProcessManager')
+        self.io_loop.spawn_callback(self.process_manager.run, async=True)
+
+    def __del__(self):
+        self.destroy()
 
     def _bind(self):
         # start up the event publisher, so we can see events during startup

salt/modules/mine.py

@@ -84,7 +84,7 @@ def update(clear=False):
     '''
     Execute the configured functions and send the data back up to the master.
     The functions to be executed are merged from the master config, pillar and
-    minion config under the option "function_cache":
+    minion config under the option `mine_functions`:
 
     .. code-block:: yaml
 

tests/unit/transport/tcp_test.py

@@ -78,6 +78,14 @@ class BaseTCPReqCase(TestCase):
         cls.server_channel.close()
         del cls.server_channel
 
+    @classmethod
+    @tornado.gen.coroutine
+    def _handle_payload(cls, payload):
+        '''
+        TODO: something besides echo
+        '''
+        raise tornado.gen.Return((payload, {'fun': 'send_clear'}))
+
 
 @skipIf(salt.utils.is_darwin(), 'hanging test suite on MacOS')
 class ClearReqTestCases(BaseTCPReqCase, ReqChannelMixin):

tests/utils/__init__.py

@@ -111,8 +111,9 @@ if HAS_CHERRYPY:
         }
 
         def setUp(self):
-            if hasattr(self, '_cp_config'):
-                Root._cp_config = self._cp_config
+            if not hasattr(self, '_cp_config'):
+                self._cp_config = {}
+            Root._cp_config = self._cp_config
             root = Root()
 
             cherrypy.tree.mount(root, '/', self.conf)