Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package salt for openSUSE:Factory checked in at 2025-09-25 18:43:48 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/salt (Old) and /work/SRC/openSUSE:Factory/.salt.new.11973 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "salt" Thu Sep 25 18:43:48 2025 rev:181 rq:1306873 version:3006.0 Changes: -------- --- /work/SRC/openSUSE:Factory/salt/salt.changes 2025-09-20 22:03:58.866421020 +0200 +++ /work/SRC/openSUSE:Factory/.salt.new.11973/salt.changes 2025-09-25 18:43:58.834869421 +0200 @@ -1,0 +2,10 @@ +Wed Sep 17 08:15:33 UTC 2025 - Pablo Suárez Hernández <[email protected]> + +- Make test_pillar_timeout test more reliable +- Modify README and other doc files for openSUSE + +- Added: + * even-more-reliable-pillar-timeout-test.patch + * modify-readme-for-opensuse-728.patch + +------------------------------------------------------------------- New: ---- even-more-reliable-pillar-timeout-test.patch modify-readme-for-opensuse-728.patch ----------(New B)---------- New:- Added: * even-more-reliable-pillar-timeout-test.patch * modify-readme-for-opensuse-728.patch New: * even-more-reliable-pillar-timeout-test.patch * modify-readme-for-opensuse-728.patch ----------(New E)---------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ salt.spec ++++++ --- /var/tmp/diff_new_pack.CCQHsW/_old 2025-09-25 18:44:07.883248139 +0200 +++ /var/tmp/diff_new_pack.CCQHsW/_new 2025-09-25 18:44:07.887248307 +0200 @@ -574,6 +574,11 @@ Patch178: fix-functional.states.test_user-for-sles-16-and-micr.patch # PATCH-FIX_UPSTREAM: https://github.com/saltstack/salt/pull/68247 Patch179: improve-sl-micro-6.2-detection-with-grains.patch +# PATCH-FIX_OPENSUSE: https://github.com/openSUSE/salt/pull/728 +Patch180: modify-readme-for-opensuse-728.patch +# PATCH-FIX_UPSTREAM: https://github.com/saltstack/salt/pull/68331 +# PATCH-FIX_OPENSUSE: https://github.com/openSUSE/salt/pull/729 +Patch181: even-more-reliable-pillar-timeout-test.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.CCQHsW/_old 2025-09-25 18:44:08.011253497 +0200 +++ /var/tmp/diff_new_pack.CCQHsW/_new 2025-09-25 18:44:08.015253665 +0200 @@ -1,3 +1,3 @@ -3d0c8552e7eb6fe4e4e615427ecdcae54cb505f5 +6e494f440a81039dbe5f1809b45e49f2aec7effb (No newline at EOF) ++++++ even-more-reliable-pillar-timeout-test.patch ++++++ >From dc3027bab4925228cacde00ae626bf651d0a0c3b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pablo=20Su=C3=A1rez=20Hern=C3=A1ndez?= <[email protected]> Date: Wed, 17 Sep 2025 09:56:44 +0200 Subject: [PATCH] Even more reliable pillar timeout test * Even more reliable pillar timeout test * Use sys.executable on test_pillar_timeout test --------- Co-authored-by: Daniel A. Wozniak <[email protected]> --- .../integration/minion/test_return_retries.py | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/tests/pytests/integration/minion/test_return_retries.py b/tests/pytests/integration/minion/test_return_retries.py index 45dea9c4c76..9b71bed58c5 100644 --- a/tests/pytests/integration/minion/test_return_retries.py +++ b/tests/pytests/integration/minion/test_return_retries.py @@ -5,6 +5,7 @@ import pytest from saltfactories.utils import random_string from tests.support.helpers import dedent +import salt.utils.files @pytest.fixture(scope="function") @@ -57,14 +58,13 @@ def test_publish_retry(salt_master, salt_minion_retry, salt_cli, salt_run_cli): @pytest.mark.slow_test @pytest.mark.flaky(max_runs=4) -def test_pillar_timeout(salt_master_factory): - cmd = ( - sys.executable - + ' -c "import time; time.sleep(4.8); print(\'{\\"foo\\": \\"bar\\"}\');"' - ).strip() +def test_pillar_timeout(salt_master_factory, tmp_path): + with salt.utils.files.fopen(tmp_path / "script.py", "w") as fp: + fp.write('print(\'{"foo": "bar"}\');\n') + master_overrides = { "ext_pillar": [ - {"cmd_json": cmd}, + {"cmd_json": f"{sys.executable} {tmp_path / 'script.py'}"}, ], "auto_accept": True, "worker_threads": 3, @@ -110,7 +110,11 @@ def test_pillar_timeout(salt_master_factory): sls_tempfile = master.state_tree.base.temp_file( "{}.sls".format(sls_name), sls_contents ) - with master.started(), minion1.started(), minion2.started(), minion3.started(), minion4.started(), sls_tempfile: + with master.started(), minion1.started(), minion2.started(), minion3.started(), minion4.started(), ( + sls_tempfile + ): + with salt.utils.files.fopen(tmp_path / "script.py", "w") as fp: + fp.write('import time; time.sleep(6); print(\'{"foo": "bang"}\');\n') proc = cli.run("state.sls", sls_name, minion_tgt="*") # At least one minion should have a Pillar timeout print(proc) -- 2.51.0 ++++++ modify-readme-for-opensuse-728.patch ++++++ ++++ 1210 lines (skipped)
