Merge pull request #420 from stackhpc/upstream/master-2025-05-26

Synchronise master with upstream

Author: priteau

.zuul.d/centos.yaml

@@ -48,15 +48,32 @@ def test_load_ok(self):
         with mock.patch.object(set_configs, 'open', mo):
             config = set_configs.load_config()
             set_configs.copy_config(config)
-            self.assertEqual([
-                mock.call('/var/lib/kolla/config_files/config.json'),
-                mock.call().__enter__(),
-                mock.call().read(),
-                mock.call().__exit__(None, None, None),
-                mock.call('/run_command', 'w+'),
-                mock.call().__enter__(),
-                mock.call().write('/bin/true'),
-                mock.call().__exit__(None, None, None)], mo.mock_calls)
+            if sys.version_info >= (3, 13):
+                calls = [
+                 mock.call('/var/lib/kolla/config_files/config.json'),
+                 mock.call().__enter__(),
+                 mock.call().read(),
+                 mock.call().__exit__(None, None, None),
+                 mock.call().close(),
+                 mock.call('/run_command', 'w+'),
+                 mock.call().__enter__(),
+                 mock.call().write('/bin/true'),
+                 mock.call().__exit__(None, None, None),
+                 mock.call().close()
+                ]
+            else:
+                calls = [
+                 mock.call('/var/lib/kolla/config_files/config.json'),
+                 mock.call().__enter__(),
+                 mock.call().read(),
+                 mock.call().__exit__(None, None, None),
+                 mock.call('/run_command', 'w+'),
+                 mock.call().__enter__(),
+                 mock.call().write('/bin/true'),
+                 mock.call().__exit__(None, None, None)
+                ]
+
+            self.assertEqual(calls, mo.mock_calls)
 
 
 FAKE_CONFIG_FILES = [