Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package salt for openSUSE:Factory checked in at 2026-08-01 18:27:20 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/salt (Old) and /work/SRC/openSUSE:Factory/.salt.new.16738 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "salt" Sat Aug 1 18:27:20 2026 rev:201 rq:1368345 version:3006.0 Changes: -------- --- /work/SRC/openSUSE:Factory/salt/salt.changes 2026-07-17 18:47:35.677437668 +0200 +++ /work/SRC/openSUSE:Factory/.salt.new.16738/salt.changes 2026-08-01 18:27:32.152130983 +0200 @@ -1,0 +2,8 @@ +Wed Jul 29 07:50:43 UTC 2026 - Marek Czernek <[email protected]> + +- Fix unit tests that fail due to async Tornado usage + +- Added: + * stabilize-testsuite-773.patch + +------------------------------------------------------------------- New: ---- stabilize-testsuite-773.patch ----------(New B)---------- New:- Added: * stabilize-testsuite-773.patch ----------(New E)---------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ salt.spec ++++++ --- /var/tmp/diff_new_pack.b4OxUr/_old 2026-08-01 18:27:37.248303878 +0200 +++ /var/tmp/diff_new_pack.b4OxUr/_new 2026-08-01 18:27:37.252304013 +0200 @@ -674,6 +674,8 @@ Patch216: switch-apache2ctl-to-apachectl-for-suse-oses-bsc-125.patch # PATCH-FIX_UPSTREAM: https://github.com/saltstack/salt/commit/4c4d017ddb45e4e689d978ae1deb975ad7a4c220 Patch217: stabilize-testsuite-tests-and-fix-alleventshandler-7.patch +# PATCH-FIX_OPENSUSE: https://github.com/openSUSE/salt/pull/773 +Patch218: stabilize-testsuite-773.patch ### IMPORTANT: The line below is used as a snippet marker. Do not touch it. ### SALT PATCHES LIST END ++++++ _lastrevision ++++++ --- /var/tmp/diff_new_pack.b4OxUr/_old 2026-08-01 18:27:37.384308492 +0200 +++ /var/tmp/diff_new_pack.b4OxUr/_new 2026-08-01 18:27:37.388308627 +0200 @@ -1,3 +1,3 @@ -83320aaec52c6bb44eaa751b0ed870882c648ded +afca88beea908b3ddb698166bd4cf1cee7ac54d1 (No newline at EOF) ++++++ stabilize-testsuite-773.patch ++++++ >From ea44d9df827525c8dbbb5d4e3487a0e3d00fd24e Mon Sep 17 00:00:00 2001 From: Marek Czernek <[email protected]> Date: Wed, 29 Jul 2026 09:36:58 +0200 Subject: [PATCH] Stabilize testsuite (#773) * Fix test_query_proxy * Ensure tests have open event loop during test runs --- tests/pytests/unit/test_minion.py | 4 ++-- tests/pytests/unit/transport/test_tcp.py | 3 +-- tests/unit/utils/test_http.py | 6 +++++- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/tests/pytests/unit/test_minion.py b/tests/pytests/unit/test_minion.py index 7c5c14c0182..2f2faa741d6 100644 --- a/tests/pytests/unit/test_minion.py +++ b/tests/pytests/unit/test_minion.py @@ -65,7 +65,7 @@ def test_minion_load_grains_default(minion_opts): ), ], ) -def test_send_req_tries(req_channel, minion_opts): +def test_send_req_tries(req_channel, minion_opts, io_loop): channel_enter = MagicMock() channel_enter.send.side_effect = req_channel[1] channel = MagicMock() @@ -83,7 +83,7 @@ def test_send_req_tries(req_channel, minion_opts): timeout = 60 if "Async" in req_channel[0]: - rtn = minion._send_req_async(load, timeout).result() + rtn = io_loop.run_sync(lambda: minion._send_req_async(load, timeout)) else: rtn = minion._send_req_sync(load, timeout) diff --git a/tests/pytests/unit/transport/test_tcp.py b/tests/pytests/unit/transport/test_tcp.py index d6bdbf654ea..9e8ff71bb25 100644 --- a/tests/pytests/unit/transport/test_tcp.py +++ b/tests/pytests/unit/transport/test_tcp.py @@ -450,7 +450,7 @@ def test_presence_events_callback_passed(temp_salt_master, salt_message_client): ) -def test_presence_removed_on_stream_closed(): +def test_presence_removed_on_stream_closed(io_loop): opts = {"presence_events": True} io_loop_mock = MagicMock(spec=tornado.ioloop.IOLoop) @@ -468,7 +468,6 @@ def test_presence_removed_on_stream_closed(): client._closing = True server.clients = {client} - io_loop = tornado.ioloop.IOLoop.current() package = { "topic_lst": [], "payload": "test-payload", diff --git a/tests/unit/utils/test_http.py b/tests/unit/utils/test_http.py index c1bd5c16589..31dbff26547 100644 --- a/tests/unit/utils/test_http.py +++ b/tests/unit/utils/test_http.py @@ -223,8 +223,12 @@ class HTTPPostTestCase(TestCase): } mock_curl = MagicMock() + def mock_sync_wrapper(cls, args=None, kwargs=None, **_): + return cls(*args or [], **kwargs or {}) - with patch("tornado.httpclient.HTTPClient.fetch", mock_curl): + with patch("salt.utils.http.SyncWrapper", side_effect=mock_sync_wrapper), patch( + "tornado.httpclient.AsyncHTTPClient.fetch", mock_curl + ): ret = http.query( self.post_web_root, method="POST", -- 2.55.0
