Merge "Fix test_barbican_legacy for Python 3.8"

This commit is contained in:
Zuul 2020-06-09 12:18:23 +00:00 committed by Gerrit Code Review
commit be2acaeb36
1 changed files with 13 additions and 12 deletions

View File

@ -238,20 +238,21 @@ class TestBarbicanManager(base.TestCase):
def test_get_cert_no_registration_raise_on_secret_access_failure(self): def test_get_cert_no_registration_raise_on_secret_access_failure(self):
self.bc.containers.get.return_value = self.container self.bc.containers.get.return_value = self.container
type(self.certificate).payload = mock.PropertyMock( with mock.patch('barbicanclient.v1.secrets.Secret.payload',
side_effect=ValueError) new_callable=mock.PropertyMock) as mock_payload:
mock_payload.side_effect = ValueError
# Get the container data # Get the container data
self.assertRaises( self.assertRaises(
ValueError, self.cert_manager.get_cert, ValueError, self.cert_manager.get_cert,
context=self.context, context=self.context,
cert_ref=self.container_ref, check_only=True cert_ref=self.container_ref, check_only=True
) )
# 'get' should be called once with the container_ref # 'get' should be called once with the container_ref
self.bc.containers.get.assert_called_once_with( self.bc.containers.get.assert_called_once_with(
container_ref=self.container_ref container_ref=self.container_ref
) )
def test_delete_cert(self): def test_delete_cert(self):
# Attempt to deregister as a consumer # Attempt to deregister as a consumer