diff --git a/cloud-init.spec b/cloud-init.spec index 4d226dbf156cd6ff9931c78bf38154376cd763b7..e5b1c1a333820f67c9749f27f0af1491eb4a9aa0 100644 --- a/cloud-init.spec +++ b/cloud-init.spec @@ -1,6 +1,6 @@ Name: cloud-init Version: 19.4 -Release: 8 +Release: 9 Summary: the defacto multi-distribution package that handles early initialization of a cloud instance. License: ASL 2.0 or GPLv3 URL: http://launchpad.net/cloud-init @@ -17,6 +17,7 @@ Patch6: backport-CVE-2020-8631-utils-use-SystemRandom-when-generating-random-pas Patch7: backport-CVE-2020-8632-cc_set_password-increase-random-pwlength-from-9-to-2.patch Patch8: backport-CVE-2021-3429-write-passwords-only-to-serial-console-lock-down-clo.patch Patch9: backport-testing-add-additional-mocks-to-test_net-tests-1356.patch +Patch10:fix-a-small-unitest-error.patch Patch9000: Fix-the-error-level-logs-displayed-for-the-cloud-init-local-service.patch @@ -125,6 +126,9 @@ fi %exclude /usr/share/doc/* %changelog +* Sun Apr 23 2023 shixuantong - 19.4-9 +- Fix a unitest error + * Thu Oct 13 2022 fuanan - 19.4-8 - DESC:fix the changelog exception macro diff --git a/fix-a-small-unitest-error.patch b/fix-a-small-unitest-error.patch new file mode 100644 index 0000000000000000000000000000000000000000..40f065661e5012f93c259877d4feacf3a8f022ef --- /dev/null +++ b/fix-a-small-unitest-error.patch @@ -0,0 +1,26 @@ +From ad6a8ee26ae553e9d7a9aff4e348867d32eadcf0 Mon Sep 17 00:00:00 2001 +From: yuelg +Date: Thu, 20 Apr 2023 18:16:21 +0800 +Subject: [PATCH 1/1] fix a small unitest error + +Signed-off-by: yuelg +--- + tests/unittests/test_templating.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/tests/unittests/test_templating.py b/tests/unittests/test_templating.py +index c36e6eb..39ff032 100644 +--- a/tests/unittests/test_templating.py ++++ b/tests/unittests/test_templating.py +@@ -60,7 +60,7 @@ class TestTemplates(test_helpers.CiTestCase): + blob = "blahblah $blah" + (template_type, _renderer, _contents) = templater.detect_template(blob) + self.assertIn("cheetah", template_type) +- self.assertEqual(blob, contents) ++ self.assertEqual(blob, _contents) + + blob = '##template:something-new' + self.assertRaises(ValueError, templater.detect_template, blob) +-- +2.33.0 +