packages/cloud-init
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!117 Fix a unitest error

Browse Source 
From: @tong_1001 
Reviewed-by: @ziyangc 
Signed-off-by: @ziyangc
This commit is contained in:
openeuler-ci-bot 2023-04-23 10:02:37 +00:00 committed by Gitee
commit 91784fe229
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 31 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cloud-init.spec
View File

@ -1,6 +1,6 @@
Name: cloud-init Name: cloud-init
Version: 19.4 Version: 19.4
Release: 10 Release: 11
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
@ -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 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 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 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 Patch9000: Fix-the-error-level-logs-displayed-for-the-cloud-init-local-service.patch
@ -125,6 +126,9 @@ fi
%exclude /usr/share/doc/* %exclude /usr/share/doc/*
%changelog %changelog
* Sun Apr 23 2023 shixuantong <shixuantong1@huawei.com> - 19.4-11
- Fix a unitest error
* Thu Feb 02 2023 shixuantong <shixuantong1@huawei.com> - 19.4-10 * Thu Feb 02 2023 shixuantong <shixuantong1@huawei.com> - 19.4-10
- revert make the same authentication behavior for arm and x86 machine - revert make the same authentication behavior for arm and x86 machine

26
fix-a-small-unitest-error.patch Normal file
View 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 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