From 486802f6dd5edb4908e3dde7f8438a4b1399599b Mon Sep 17 00:00:00 2001
From: "Daniel A. Wozniak" <dwozniak@vmware.com>
Date: Thu, 18 May 2023 00:10:57 -0700
Subject: [PATCH] Fix more deltaproxy tests

---
 salt/__init__.py             | 1 +
 salt/metaproxy/deltaproxy.py | 5 +++--
 salt/minion.py               | 1 +
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/salt/__init__.py b/salt/__init__.py
index 49fea82bb42..58f756d96ce 100644
--- a/salt/__init__.py
+++ b/salt/__init__.py
@@ -12,6 +12,7 @@ if sys.version_info < (3,):
     )
     sys.stderr.flush()
 
+
 USE_VENDORED_TORNADO = False
 
 
diff --git a/salt/metaproxy/deltaproxy.py b/salt/metaproxy/deltaproxy.py
index 058f410ae58..de07a041956 100644
--- a/salt/metaproxy/deltaproxy.py
+++ b/salt/metaproxy/deltaproxy.py
@@ -356,10 +356,11 @@ def post_master_init(self, master):
         except Exception as exc:  # pylint: disable=broad-except
             log.error("Errors loading sub proxies")
 
-        _failed = self.opts["proxy"].get("ids", [])
+        _failed = self.opts["proxy"].get("ids", [])[:]
         for sub_proxy_data in results:
             minion_id = sub_proxy_data["proxy_opts"].get("id")
-            _failed.remove(minion_id)
+            if minion_id in _failed:
+                _failed.remove(minion_id)
 
             if sub_proxy_data["proxy_minion"]:
                 self.deltaproxy_opts[minion_id] = sub_proxy_data["proxy_opts"]
diff --git a/salt/minion.py b/salt/minion.py
index 191d41e37a6..5bceada8b53 100644
--- a/salt/minion.py
+++ b/salt/minion.py
@@ -1162,6 +1162,7 @@ class MinionManager(MinionBase):
                     minion.opts["master"],
                     exc_info=True,
                 )
+                break
 
     # Multi Master Tune In
     def tune_in(self):