Merge pull request #28804 from cachedout/tcp_test_fixes

TCP test fixes

salt/auth/__init__.py

@@ -341,7 +341,7 @@ class Resolver(object):
         self.auth = salt.loader.auth(opts)
 
     def _send_token_request(self, load):
-        if self.opts['transport'] == 'zeromq':
+        if self.opts['transport'] in ('zeromq', 'tcp'):
             master_uri = 'tcp://' + salt.utils.ip_bracket(self.opts['interface']) + \
                          ':' + str(self.opts['ret_port'])
             channel = salt.transport.client.ReqChannel.factory(self.opts,

salt/modules/mine.py

@@ -67,7 +67,7 @@ def _mine_send(load, opts):
 
 
 def _mine_get(load, opts):
-    if opts.get('transport', '') == 'zeromq':
+    if opts.get('transport', '') in ('zeromq', 'tcp'):
         try:
             load['tok'] = _auth().gen_token('salt')
         except AttributeError:

salt/modules/publish.py

@@ -21,7 +21,7 @@ __virtualname__ = 'publish'
 
 
 def __virtual__():
-    return __virtualname__ if __opts__.get('transport', '') == 'zeromq' else False
+    return __virtualname__ if __opts__.get('transport', '') in ('zeromq', 'tcp') else False
 
 
 def _parse_args(arg):

salt/netapi/__init__.py

@@ -38,9 +38,13 @@ class NetapiClient(object):
         Note, this will return an invalid success if the master crashed or was
         not shut down cleanly.
         '''
+        if self.opts['transport'] == 'tcp':
+            ipc_file = 'publish_pull.ipc'
+        else:
+            ipc_file = 'workers.ipc'
         return os.path.exists(os.path.join(
             self.opts['sock_dir'],
-            'workers.ipc'))
+            ipc_file))
 
     def run(self, low):
         '''

salt/transport/tcp.py

@@ -82,11 +82,9 @@ class AsyncTCPReqChannel(salt.transport.client.ReqChannel):
 
     @classmethod
     def __key(cls, opts, **kwargs):
-        if 'master_uri' in kwargs:
-            opts['master_uri'] = kwargs['master_uri']
         return (opts['pki_dir'],     # where the keys are stored
                 opts['id'],          # minion ID
-                opts['master_uri'],  # master ID
+                kwargs.get('master_uri') or opts.get('master_uri'),  # master ID
                 kwargs.get('crypt', 'aes'),  # TODO: use the same channel for crypt
                 )
 

tests/integration/shell/matcher.py

@@ -170,7 +170,7 @@ class MatchTest(integration.ShellCase, integration.ShellCaseCommonTestsMixIn):
         self.assertNotIn('minion', data.replace('sub_minion', 'stub'))
         data = self.run_salt('-G "planets:pluto" test.ping')
         expect = None
-        if self.master_opts['transport'] == 'zeromq':
+        if self.master_opts['transport'] in ('zeromq', 'tcp'):
             expect = (
                 'No minions matched the target. '
                 'No command was sent, no jid was '