From bbf9687b717be182ec90139e4fc132a58b6c0a7d Mon Sep 17 00:00:00 2001 From: Alistair Coles Date: Fri, 14 Apr 2023 10:46:45 +0100 Subject: InternalClient: error if allow_modify_pipeline is True allow_modify_pipeline is no longer supported, but if a caller is still setting it to True then raise ValueError, because the InternalClient instance will no longer behave in the way the caller previously expected. Change-Id: I24015b8becc7289a7d72f9a5863d201e27bcc955 --- test/unit/common/test_internal_client.py | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) (limited to 'test') diff --git a/test/unit/common/test_internal_client.py b/test/unit/common/test_internal_client.py index 1ccbf30f0..65bbed9a9 100644 --- a/test/unit/common/test_internal_client.py +++ b/test/unit/common/test_internal_client.py @@ -437,6 +437,27 @@ class TestInternalClient(unittest.TestCase): self.assertEqual(request_tries, client.request_tries) self.assertTrue(client.use_replication_network) + def test_init_allow_modify_pipeline(self): + conf_path = 'some_path' + app = FakeSwift() + user_agent = 'some_user_agent' + + with mock.patch.object( + internal_client, 'loadapp', return_value=app) as mock_loadapp,\ + self.assertRaises(ValueError) as cm: + internal_client.InternalClient( + conf_path, user_agent, 1, allow_modify_pipeline=True) + mock_loadapp.assert_not_called() + self.assertIn("'allow_modify_pipeline' is no longer supported", + str(cm.exception)) + + with mock.patch.object( + internal_client, 'loadapp', return_value=app) as mock_loadapp: + internal_client.InternalClient( + conf_path, user_agent, 1, allow_modify_pipeline=False) + mock_loadapp.assert_called_once_with( + conf_path, allow_modify_pipeline=False, global_conf=None) + def test_gatekeeper_not_loaded(self): app = FakeSwift() pipeline = [app] -- cgit v1.2.1