From 04a12ecccf57646ba82a91cc8c88ca7b9a323eab Mon Sep 17 00:00:00 2001 From: James Page Date: Fri, 15 Nov 2024 13:41:56 +0000 Subject: [PATCH] Fix compatibility with Python 3.12+ Refresh unit test assertions for hard removals in Python 3.12. Change-Id: I80f64a47f81dc0314823cd6df6283a0c0603a387 --- unit_tests/test_actions.py | 4 ++-- unit_tests/test_swift_storage_context.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/unit_tests/test_actions.py b/unit_tests/test_actions.py index d52038b..0f0fe99 100644 --- a/unit_tests/test_actions.py +++ b/unit_tests/test_actions.py @@ -99,7 +99,7 @@ class PauseTestCase(CharmTestCase): return True self.service_pause.side_effect = maybe_kill - self.assertRaisesRegexp( + self.assertRaisesRegex( Exception, "swift-container didn't stop cleanly.", actions.actions.pause, self.args) self.assertEqual(pause_calls, ['swift-account', @@ -174,7 +174,7 @@ class ResumeTestCase(CharmTestCase): return True self.service_resume.side_effect = maybe_kill - self.assertRaisesRegexp( + self.assertRaisesRegex( Exception, "swift-container didn't start cleanly.", actions.actions.resume, self.args) self.assertEqual(resume_calls, ['swift-account', diff --git a/unit_tests/test_swift_storage_context.py b/unit_tests/test_swift_storage_context.py index 8c055d4..0c9bef5 100644 --- a/unit_tests/test_swift_storage_context.py +++ b/unit_tests/test_swift_storage_context.py @@ -90,7 +90,7 @@ class SwiftStorageContextTests(CharmTestCase): 'object_rsync_timeout': 1000, 'object_lockup_timeout': 2010, } - self.assertDictContainsSubset(ex, result) + self.assertEqual(result, result | ex) def test_swift_storage_server_context(self): self.unit_private_ip.return_value = '10.0.0.5'