summaryrefslogtreecommitdiffstats
path: root/nova/tests
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2012-01-19 16:08:58 +0000
committerGerrit Code Review <review@openstack.org>2012-01-19 16:08:58 +0000
commitf2027a63a1f8aae1cb2105b3e10ae66318beef1d (patch)
tree19f5700386c0017248737b94cd4e7ee4de9dff60 /nova/tests
parent3a9018e5221a189b7843a1ea99933724f4b4b67d (diff)
parent1eba47cff9cce4e040203b2af8ad70776bf79d12 (diff)
Merge "Clean up crypto.py"
Diffstat (limited to 'nova/tests')
-rw-r--r--nova/tests/test_auth.py6
1 files changed, 1 insertions, 5 deletions
diff --git a/nova/tests/test_auth.py b/nova/tests/test_auth.py
index 1b3166af7..b1feb0856 100644
--- a/nova/tests/test_auth.py
+++ b/nova/tests/test_auth.py
@@ -255,15 +255,11 @@ class _AuthManagerBaseTestCase(test.TestCase):
_key, cert_str = crypto.generate_x509_cert(user.id, project.id)
LOG.debug(cert_str)
- full_chain = crypto.fetch_ca(project_id=project.id, chain=True)
- int_cert = crypto.fetch_ca(project_id=project.id, chain=False)
+ int_cert = crypto.fetch_ca(project_id=project.id)
cloud_cert = crypto.fetch_ca()
- LOG.debug("CA chain:\n\n =====\n%s\n\n=====", full_chain)
signed_cert = X509.load_cert_string(cert_str)
- chain_cert = X509.load_cert_string(full_chain)
int_cert = X509.load_cert_string(int_cert)
cloud_cert = X509.load_cert_string(cloud_cert)
- self.assertTrue(signed_cert.verify(chain_cert.get_pubkey()))
self.assertTrue(signed_cert.verify(int_cert.get_pubkey()))
if not FLAGS.use_project_ca: