test_clients.py (ec2-api-12.0.0) | : | test_clients.py (ec2-api-13.0.0) | ||
---|---|---|---|---|
skipping to change at line 118 | skipping to change at line 118 | |||
self.assertEqual(glance.return_value, res) | self.assertEqual(glance.return_value, res) | |||
glance.assert_called_with(version='2', service_type='image', | glance.assert_called_with(version='2', service_type='image', | |||
session=mock.sentinel.session) | session=mock.sentinel.session) | |||
@mock.patch('cinderclient.client.Client') | @mock.patch('cinderclient.client.Client') | |||
def test_cinder(self, cinder): | def test_cinder(self, cinder): | |||
# test normal flow | # test normal flow | |||
context = mock.NonCallableMock(session=mock.sentinel.session) | context = mock.NonCallableMock(session=mock.sentinel.session) | |||
res = clients.cinder(context) | res = clients.cinder(context) | |||
self.assertEqual(cinder.return_value, res) | self.assertEqual(cinder.return_value, res) | |||
cinder.assert_called_with('2', service_type='volumev3', | cinder.assert_called_with('3', service_type='volumev3', | |||
session=mock.sentinel.session) | session=mock.sentinel.session) | |||
@mock.patch('keystoneclient.client.Client') | @mock.patch('keystoneclient.client.Client') | |||
def test_keystone(self, keystone): | def test_keystone(self, keystone): | |||
context = mock.NonCallableMock(session=mock.sentinel.session) | context = mock.NonCallableMock(session=mock.sentinel.session) | |||
res = clients.keystone(context) | res = clients.keystone(context) | |||
self.assertEqual(keystone.return_value, res) | self.assertEqual(keystone.return_value, res) | |||
keystone.assert_called_with(auth_url='v2', | keystone.assert_called_with(auth_url='v3', | |||
session=mock.sentinel.session) | session=mock.sentinel.session) | |||
End of changes. 2 change blocks. | ||||
2 lines changed or deleted | 2 lines changed or added |