forked from pool/cloud-init
Robert Schweikert
5ddab47951
+ Remove patches included upstream: - cloud-init-btrfs-queue-resize.patch - cloud-init-micro-is-suse.patch - cloud-init-suse-afternm.patch - cloud-init-prefer-nm.patch - cloud-init-transact-up.patch + Forward port - cloud-init-write-routes.patch + Added - cloud-init-fix-ca-test.patch + Support transactional-updates for SUSE based distros (#1997) [Robert Schweikert] + Set ownership for new folders in Write Files Module (#1980) [Jack] (LP: #1990513) + add OpenCloudOS and TencentOS support (#1964) [wynnfeng] + lxd: Retry if the server isn't ready (#2025) + test: switch pycloudlib source to pypi (#2024) + test: Fix integration test deprecation message (#2023) + Recognize opensuse-microos, dev tooling fixes [Robert Schweikert] + sources/azure: refactor imds handler into own module (#1977) [Chris Patterson] + docs: deprecation generation support [1/2] (#2013) + add function is_virtual to distro/FreeBSD (#1957) [Mina Galić] + cc_ssh: support multiple hostcertificates (#2018) (LP: #1999164) + Fix minor schema validation regression and fixup typing (#2017) + doc: Reword user data debug section (#2019) + Overhaul/rewrite of certificate handling as follows: (#1962) [dermotbradley] (LP: #1931174) + disk_setup: use byte string when purging the partition table (#2012) OBS-URL: https://build.opensuse.org/package/show/Cloud:Tools/cloud-init?expand=0&rev=203
19 lines
741 B
Diff
19 lines
741 B
Diff
--- tests/unittests/config/test_cc_ca_certs.py.orig
|
|
+++ tests/unittests/config/test_cc_ca_certs.py
|
|
@@ -311,6 +311,7 @@ class TestRemoveDefaultCaCerts(TestCase)
|
|
"cloud_dir": tmpdir,
|
|
}
|
|
)
|
|
+ self.add_patch("cloudinit.config.cc_ca_certs.os.stat", "m_stat")
|
|
|
|
def test_commands(self):
|
|
ca_certs_content = "# line1\nline2\nline3\n"
|
|
@@ -318,6 +319,7 @@ class TestRemoveDefaultCaCerts(TestCase)
|
|
"# line1\n# Modified by cloud-init to deselect certs due to"
|
|
" user-data\n!line2\n!line3\n"
|
|
)
|
|
+ self.m_stat.return_value.st_size = 1
|
|
|
|
for distro_name in cc_ca_certs.distros:
|
|
conf = cc_ca_certs._distro_ca_certs_configs(distro_name)
|