From 8890635449a3b606f62661a52368aa11f3d378d1 Mon Sep 17 00:00:00 2001
From: "Daniel A. Wozniak" <dwozniak@vmware.com>
Date: Tue, 4 Jul 2023 00:51:44 -0700
Subject: [PATCH] More test fixes

---
 salt/transport/tcp.py    | 14 ++++++++++++--
 salt/transport/zeromq.py |  3 ++-
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/salt/transport/tcp.py b/salt/transport/tcp.py
index 3965ecacaa3..5b75f766fc1 100644
--- a/salt/transport/tcp.py
+++ b/salt/transport/tcp.py
@@ -293,7 +293,7 @@ class TCPPubClient(salt.transport.base.PublishClient):
         while stream is None and (not self._closed and not self._closing):
             try:
                 if self.host and self.port:
-                    log.trace(
+                    log.debug(
                         "PubClient connecting to %r %r:%r", self, self.host, self.port
                     )
                     self._tcp_client = TCPClientKeepAlive(
@@ -313,7 +313,7 @@ class TCPPubClient(salt.transport.base.PublishClient):
                         "PubClient conencted to %r %r:%r", self, self.host, self.port
                     )
                 else:
-                    log.trace("PubClient connecting to %r %r", self, self.path)
+                    log.debug("PubClient connecting to %r %r", self, self.path)
                     sock_type = socket.AF_UNIX
                     stream = tornado.iostream.IOStream(
                         socket.socket(sock_type, socket.SOCK_STREAM)
@@ -382,9 +382,19 @@ class TCPPubClient(salt.transport.base.PublishClient):
                 framed_msg = salt.transport.frame.decode_embedded_strs(msg)
                 return framed_msg["body"]
             try:
+                log.error("Stream is %r", self._stream)
                 events, _, _ = select.select([self._stream.socket], [], [], 0)
             except TimeoutError:
                 events = []
+            #except TypeError:
+            #    # Stream's socket is closed.
+            #    stream = self._stream
+            #    self._stream = None
+            #    stream.close()
+            #    if self.disconnect_callback:
+            #        self.disconnect_callback()
+            #    await self.connect()
+            #    events = []
             if events:
                 while not self._closing:
                     await self._read_in_progress.acquire()
diff --git a/salt/transport/zeromq.py b/salt/transport/zeromq.py
index b76240a2dd0..e172132a55e 100644
--- a/salt/transport/zeromq.py
+++ b/salt/transport/zeromq.py
@@ -1124,8 +1124,9 @@ class RequestClient(salt.transport.base.RequestClient):
         await self.sending.acquire()
         try:
             return await asyncio.wait_for(self._send_recv(load), timeout=timeout)
-        except TimeoutError:
+        except (asyncio.exceptions.TimeoutError, TimeoutError):
             self.close()
+            raise
         # except Exception:
         #     self.close()
         finally: