From b90c2b003c2deea18d423aef7f766aa11e99b241cf8c7b6ea0bd0cdbe94691ea Mon Sep 17 00:00:00 2001 From: Victor Zhestkov Date: Tue, 9 Jul 2024 11:29:56 +0000 Subject: [PATCH] - test_vultrpy: adjust test expectation to prevent failure after Debian 10 EOL - Added: * test_vultrpy-adjust-test-expectation-to-prevent-fail.patch OBS-URL: https://build.opensuse.org/package/show/systemsmanagement:saltstack/salt?expand=0&rev=249 --- _lastrevision | 2 +- salt.changes | 8 ++++++ salt.spec | 2 ++ ...ust-test-expectation-to-prevent-fail.patch | 28 +++++++++++++++++++ 4 files changed, 39 insertions(+), 1 deletion(-) create mode 100644 test_vultrpy-adjust-test-expectation-to-prevent-fail.patch diff --git a/_lastrevision b/_lastrevision index 6dee027..1e0d9aa 100644 --- a/_lastrevision +++ b/_lastrevision @@ -1 +1 @@ -9a488902bc0653a10dba209ad9150d2939215954 \ No newline at end of file +131b293221061447f0dc87b9b57ba29c1b8a7ae4 \ No newline at end of file diff --git a/salt.changes b/salt.changes index d7df1ff..e1a7f3d 100644 --- a/salt.changes +++ b/salt.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Tue Jul 9 11:23:20 UTC 2024 - Pablo Suárez Hernández + +- test_vultrpy: adjust test expectation to prevent failure after Debian 10 EOL + +- Added: + * test_vultrpy-adjust-test-expectation-to-prevent-fail.patch + ------------------------------------------------------------------- Mon Jul 8 16:02:47 UTC 2024 - Pablo Suárez Hernández diff --git a/salt.spec b/salt.spec index 94234f6..4569c1d 100644 --- a/salt.spec +++ b/salt.spec @@ -406,6 +406,8 @@ Patch122: fix-status.diskusage-and-exclude-some-tests-to-run-w.patch Patch123: fix-user.list_groups-omits-remote-groups.patch # PATCH-FIX_UPSTREAM https://github.com/saltstack/salt/pull/66695 Patch124: some-more-small-tests-fixes-enhancements-661.patch +# PATCH-FIX_OPENSUSE: https://github.com/openSUSE/salt/pull/666 +Patch125: test_vultrpy-adjust-test-expectation-to-prevent-fail.patch ### IMPORTANT: The line below is used as a snippet marker. Do not touch it. ### SALT PATCHES LIST END diff --git a/test_vultrpy-adjust-test-expectation-to-prevent-fail.patch b/test_vultrpy-adjust-test-expectation-to-prevent-fail.patch new file mode 100644 index 0000000..841dcd9 --- /dev/null +++ b/test_vultrpy-adjust-test-expectation-to-prevent-fail.patch @@ -0,0 +1,28 @@ +From e24c5dbc8c48ce46d3a87cd527677b980c29124d Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Pablo=20Su=C3=A1rez=20Hern=C3=A1ndez?= + +Date: Tue, 9 Jul 2024 12:19:36 +0100 +Subject: [PATCH] test_vultrpy: adjust test expectation to prevent + failure (#666) + +--- + tests/integration/cloud/clouds/test_vultrpy.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/tests/integration/cloud/clouds/test_vultrpy.py b/tests/integration/cloud/clouds/test_vultrpy.py +index a25b4502dae..719d7291410 100644 +--- a/tests/integration/cloud/clouds/test_vultrpy.py ++++ b/tests/integration/cloud/clouds/test_vultrpy.py +@@ -19,7 +19,7 @@ class VultrTest(CloudTest): + """ + image_list = self.run_cloud("--list-images {}".format(self.PROVIDER)) + +- self.assertIn("Debian 10 x64 (buster)", [i.strip() for i in image_list]) ++ self.assertIn("Debian 12 x64 (bookworm)", [i.strip() for i in image_list]) + + def test_list_locations(self): + """ +-- +2.45.2 + +