Merge branch '3006.x' into add-new-os-support

saltstack · May 10, 2024 · ddae834 · ddae834
2 parents 2d89ff8 + 65c65aa
commit ddae834
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/tests/pytests/functional/transport/tcp/test_message_client.py b/tests/pytests/functional/transport/tcp/test_message_client.py
@@ -25,7 +25,9 @@ class TestServer(salt.ext.tornado.tcpserver.TCPServer):
         send = []
         disconnect = False
 
-        async def handle_stream(self, stream, address):
+        async def handle_stream(  # pylint: disable=invalid-overridden-method
+            self, stream, address
+        ):
             while self.disconnect is False:
                 for msg in self.send[:]:
                     msg = self.send.pop(0)

diff --git a/tests/pytests/unit/utils/parsers/test_saltfile_mixin.py b/tests/pytests/unit/utils/parsers/test_saltfile_mixin.py
@@ -2,7 +2,7 @@
 Tests the SaltfileMixIn.
 """
 
-import optparse
+import optparse  # pylint: disable=deprecated-module
 import shutil
 
 import pytest