MAAS

Merge ~adam-collard/maas:flaky-test-sample-certificate-path into maas:master

  1. Git
  2. lp:~adam-collard/maas
  3. flaky-test-sample-certificate-path
  4. Merge into master
Proposed by Adam Collard
Status: Merged
Approved by: Adam Collard
Approved revision: 78b475993f4ec6d8e34c451eda60765b5d179e2e
Merge reported by: MAAS Lander
Merged at revision: not available
Proposed branch: ~adam-collard/maas:flaky-test-sample-certificate-path
Merge into: maas:master
Diff against target: 24 lines (+5/-3)
1 file modified
src/provisioningserver/testing/certificates.py (+5/-3)
Reviewer Review Type Date Requested Status
MAAS Lander Approve
Igor Brovtsin (community) Approve
Review via email: mp+450330@code.launchpad.net

Commit message

fix(testing): atomically write sample certificate

Fixes bug 2033650

To post a comment you must log in.
Revision history for this message
Igor Brovtsin (igor-brovtsin) wrote :

+1

review: Approve
Revision history for this message
MAAS Lander (maas-lander) wrote :

UNIT TESTS
-b flaky-test-sample-certificate-path lp:~adam-collard/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: SUCCESS
COMMIT: 78b475993f4ec6d8e34c451eda60765b5d179e2e

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/src/provisioningserver/testing/certificates.py b/src/provisioningserver/testing/certificates.py
2index fe71fd3..6c5f136 100644
3--- a/src/provisioningserver/testing/certificates.py
4+++ b/src/provisioningserver/testing/certificates.py
5@@ -3,6 +3,7 @@ from functools import lru_cache
6 from fixtures import Fixture
7
8 from provisioningserver.certificates import Certificate
9+from provisioningserver.utils.fs import atomic_write
10
11
12 @lru_cache(maxsize=5)
13@@ -35,7 +36,8 @@ class SampleCertificateFixture(Fixture):
14 cert = get_sample_cert()
15 cert_pem = cert.certificate_pem()
16 key_pem = cert.private_key_pem()
17- with self.cache_path.open("wb") as fh:
18- fh.write(cert_pem.encode("ascii"))
19- fh.write(key_pem.encode("ascii"))
20+ atomic_write(
21+ cert_pem.encode("ascii") + key_pem.encode("ascii"),
22+ self.cache_path,
23+ )
24 self.cert = cert

Subscribers

People subscribed via source and target branches