From c18d434439e5b3785a59e845cac1a111869ff522 Mon Sep 17 00:00:00 2001 From: Olivier Gayot Date: Thu, 25 Apr 2024 16:18:56 +0200 Subject: [PATCH] file-util: replace use of deprecate datetime.datetime.utcnow() Signed-off-by: Olivier Gayot --- subiquity/models/tests/test_subiquity.py | 11 +++++++---- subiquitycore/file_util.py | 2 +- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/subiquity/models/tests/test_subiquity.py b/subiquity/models/tests/test_subiquity.py index 042ae3dd..b2ded689 100644 --- a/subiquity/models/tests/test_subiquity.py +++ b/subiquity/models/tests/test_subiquity.py @@ -13,6 +13,7 @@ # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see . +import datetime import fnmatch import json import re @@ -264,11 +265,13 @@ class TestSubiquityModel(unittest.IsolatedAsyncioTestCase): self.assertEqual(expected_error, str(ctx.exception)) @mock.patch("subiquity.models.subiquity.lsb_release") - @mock.patch("subiquitycore.file_util.datetime.datetime") + @mock.patch("subiquitycore.file_util.datetime.datetime", wraps=datetime.datetime) def test_cloud_init_files_emits_datasource_config_and_clean_script( - self, datetime, lsb_release + self, m_datetime, lsb_release ): - datetime.utcnow.return_value = "2004-03-05 ..." + m_datetime.now.return_value = datetime.datetime( + 2004, 3, 5, tzinfo=datetime.timezone.utc + ) main_user = IdentityData( username="mainuser", crypted_password="sample_pass", hostname="somehost" ) @@ -296,7 +299,7 @@ grub_dpkg: # NETPLAN_CONFIG_ROOT_READ_ONLY is True "/etc/cloud/cloud.cfg.d/90-installer-network.cfg" ) - header = "# Autogenerated by Subiquity: 2004-03-05 ... UTC\n" + header = "# Autogenerated by Subiquity: 2004-03-05 00:00:00 UTC\n" with self.subTest( "Stable releases Jammy do not disable cloud-init." " NETPLAN_ROOT_READ_ONLY=True uses cloud-init networking" diff --git a/subiquitycore/file_util.py b/subiquitycore/file_util.py index c1e48e50..f31509d1 100644 --- a/subiquitycore/file_util.py +++ b/subiquitycore/file_util.py @@ -70,7 +70,7 @@ def write_file(filename, content, **kwargs): def generate_timestamped_header() -> str: - now = datetime.datetime.utcnow() + now = datetime.datetime.now(datetime.timezone.utc).replace(tzinfo=None) return f"# Autogenerated by Subiquity: {now} UTC\n"