Fix a unitest error
(cherry picked from commit ad95ad36c994f9907eb07a16962fc31ebcad653a)
This commit is contained in:
parent
1244602837
commit
6f76ce2476
@ -1,6 +1,6 @@
|
|||||||
Name: cloud-init
|
Name: cloud-init
|
||||||
Version: 21.4
|
Version: 21.4
|
||||||
Release: 12
|
Release: 13
|
||||||
Summary: the defacto multi-distribution package that handles early initialization of a cloud instance.
|
Summary: the defacto multi-distribution package that handles early initialization of a cloud instance.
|
||||||
License: ASL 2.0 or GPLv3
|
License: ASL 2.0 or GPLv3
|
||||||
URL: http://launchpad.net/cloud-init
|
URL: http://launchpad.net/cloud-init
|
||||||
@ -21,6 +21,7 @@ Patch9: backport-netplan-define-features.NETPLAN_CONFIG_ROOT_READ_ONL.patch
|
|||||||
Patch10: backport-Fix-the-distro.osfamily-output-problem.patch
|
Patch10: backport-Fix-the-distro.osfamily-output-problem.patch
|
||||||
Patch11: backport-netplan-keep-custom-strict-perms-when-50-cloud-init.patch
|
Patch11: backport-netplan-keep-custom-strict-perms-when-50-cloud-init.patch
|
||||||
Patch12: backport-Do-not-change-permissions-of-netrules-target.patch
|
Patch12: backport-Do-not-change-permissions-of-netrules-target.patch
|
||||||
|
Patch13: fix-a-small-unitest-error.patch
|
||||||
|
|
||||||
Patch9000: Fix-the-error-level-logs-displayed-for-the-cloud-init-local-service.patch
|
Patch9000: Fix-the-error-level-logs-displayed-for-the-cloud-init-local-service.patch
|
||||||
|
|
||||||
@ -132,6 +133,9 @@ fi
|
|||||||
%exclude /usr/share/doc/*
|
%exclude /usr/share/doc/*
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Sun Apr 23 2023 shixuantong <shixuantong1@huawei.com> - 21.4-13
|
||||||
|
- Fix a unitest error
|
||||||
|
|
||||||
* Thu Apr 13 2023 shixuantong <shixuantong1@huawei.com> - 21.4-12
|
* Thu Apr 13 2023 shixuantong <shixuantong1@huawei.com> - 21.4-12
|
||||||
- Don't change permissions of netrules target
|
- Don't change permissions of netrules target
|
||||||
|
|
||||||
|
|||||||
26
fix-a-small-unitest-error.patch
Normal file
26
fix-a-small-unitest-error.patch
Normal file
@ -0,0 +1,26 @@
|
|||||||
|
From ad6a8ee26ae553e9d7a9aff4e348867d32eadcf0 Mon Sep 17 00:00:00 2001
|
||||||
|
From: yuelg <yuelg@chinaunicom.cn>
|
||||||
|
Date: Thu, 20 Apr 2023 18:16:21 +0800
|
||||||
|
Subject: [PATCH 1/1] fix a small unitest error
|
||||||
|
|
||||||
|
Signed-off-by: yuelg <yuelg@chinaunicom.cn>
|
||||||
|
---
|
||||||
|
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 cba0983..116a647 100644
|
||||||
|
--- a/tests/unittests/test_templating.py
|
||||||
|
+++ b/tests/unittests/test_templating.py
|
||||||
|
@@ -58,7 +58,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
|
||||||
|
|
||||||
Loading…
x
Reference in New Issue
Block a user