diff --git a/cloud-init.spec b/cloud-init.spec index e56e5163738782a58a0ffbc78a2b63e521827aaf..dc470d3bf5c2dd8fa442e6d9caac22a41bd31bc3 100644 --- a/cloud-init.spec +++ b/cloud-init.spec @@ -1,6 +1,6 @@ Name: cloud-init Version: 21.4 -Release: 9 +Release: 10 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 @@ -20,6 +20,7 @@ Patch8: backport-netplan-define-features.NETPLAN_CONFIG_ROOT_READ_ONL.patch Patch9: backport-Fix-the-distro.osfamily-output-problem.patch Patch10:backport-netplan-keep-custom-strict-perms-when-50-cloud-init.patch Patch11:backport-Do-not-change-permissions-of-netrules-target.patch +Patch12: fix-unittests.patch Patch9000: Fix-the-error-level-logs-displayed-for-the-cloud-init-local-service.patch @@ -131,6 +132,9 @@ fi %exclude /usr/share/doc/* %changelog +* Sat Apr 15 2023 bigclouds99 - 21.4-10 +- Fix a unitest error + * Thu Apr 13 2023 shixuantong - 21.4-9 - Don't change permissions of netrules target diff --git a/fix-unittests.patch b/fix-unittests.patch new file mode 100644 index 0000000000000000000000000000000000000000..7e3d7614e68fd66a56fd89b4e6730562b5dcef21 --- /dev/null +++ b/fix-unittests.patch @@ -0,0 +1,11 @@ +--- a/tests/unittests/test_templating.py 2023-03-16 17:06:26.151150107 +0800 ++++ b/tests/unittests/test_templating.py 2023-03-16 17:06:17.234010784 +0800 +@@ -58,7 +58,7 @@ + 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)