summaryrefslogtreecommitdiff
path: root/nova/tests/test_cinder.py
diff options
context:
space:
mode:
Diffstat (limited to 'nova/tests/test_cinder.py')
-rw-r--r--nova/tests/test_cinder.py10
1 files changed, 5 insertions, 5 deletions
diff --git a/nova/tests/test_cinder.py b/nova/tests/test_cinder.py
index ae1382c69e..6e66ccf6cc 100644
--- a/nova/tests/test_cinder.py
+++ b/nova/tests/test_cinder.py
@@ -155,7 +155,7 @@ class CinderTestCase(test.NoDBTestCase):
def test_context_with_catalog(self):
self.api.get(self.context, '1234')
self.assert_called('GET', '/volumes/1234')
- self.assertEquals(
+ self.assertEqual(
self.fake_client_factory.client.client.management_url,
'http://localhost:8776/v1/project_id')
@@ -165,7 +165,7 @@ class CinderTestCase(test.NoDBTestCase):
)
self.api.get(self.context, '1234')
self.assert_called('GET', '/volumes/1234')
- self.assertEquals(
+ self.assertEqual(
self.fake_client_factory.client.client.management_url,
'http://other_host:8776/v1/project_id')
@@ -185,7 +185,7 @@ class CinderTestCase(test.NoDBTestCase):
self.flags(cinder_api_insecure=True)
self.api.get(self.context, '1234')
self.assert_called('GET', '/volumes/1234')
- self.assertEquals(
+ self.assertEqual(
self.fake_client_factory.client.client.verify_cert, False)
def test_cinder_api_cacert_file(self):
@@ -193,7 +193,7 @@ class CinderTestCase(test.NoDBTestCase):
self.flags(cinder_ca_certificates_file=cacert)
self.api.get(self.context, '1234')
self.assert_called('GET', '/volumes/1234')
- self.assertEquals(
+ self.assertEqual(
self.fake_client_factory.client.client.verify_cert, cacert)
def test_cinder_http_retries(self):
@@ -201,5 +201,5 @@ class CinderTestCase(test.NoDBTestCase):
self.flags(cinder_http_retries=retries)
self.api.get(self.context, '1234')
self.assert_called('GET', '/volumes/1234')
- self.assertEquals(
+ self.assertEqual(
self.fake_client_factory.client.client.retries, retries)