openstack/barbican
Code Issues Proposed changes

Merge "Add skips for KMIP functional tests"

Browse Source
This commit is contained in:
Jenkins 2016-04-09 09:27:41 +00:00 committed by Gerrit Code Review
commit f428dd6be9
3 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
barbican/tests/utils.py
View File

@ -14,6 +14,7 @@
# limitations under the License.
import datetime
import functools
import os
from os import path
import time
import types
@ -309,7 +310,8 @@ def construct_new_test_function(original_func, name, build_params):
six.get_function_code(original_func),
six.get_function_globals(original_func),
name=name,
argdefs=six.get_function_defaults(original_func)
argdefs=six.get_function_defaults(original_func),
closure=six.get_function_closure(original_func)
)
for key, val in original_func.__dict__.items():
@ -478,5 +480,9 @@ def is_public_key_valid(expected, observed):
return True
def is_kmip_enabled():
return os.environ.get('KMIP_PLUGIN_ENABLED') is not None
class DummyClassForTesting(object):
pass

9
functionaltests/api/v1/functional/test_rsa.py
View File

@ -16,6 +16,7 @@ import base64
from Crypto.PublicKey import RSA
from OpenSSL import crypto
import testtools
from testtools import testcase
from barbican.tests import keys
@ -218,6 +219,8 @@ class RSATestCase(base.TestCase):
self.verify_container_keys_equal(secrets)
@testcase.attr('positive')
@testtools.skipIf(utils.is_kmip_enabled(),
"PyKMIP does not support this operation")
def test_rsa_store_and_get_container_with_passphrase(self):
"""Post and Get for container with passphrase"""
public_ref = self.store_public_key()
@ -238,6 +241,8 @@ class RSATestCase(base.TestCase):
self.verify_container_keys_valid(secrets)
@testcase.attr('positive')
@testtools.skipIf(utils.is_kmip_enabled(),
"PyKMIP does not support this operation")
def test_rsa_order_container_with_passphrase(self):
"""Post an order for a container with a passphrase"""
order_ref = self.order_container(with_passphrase=True)
@ -268,6 +273,8 @@ class RSATestCase(base.TestCase):
self.verify_certificate_order_status(order_status)
@testcase.attr('positive')
@testtools.skipIf(utils.is_kmip_enabled(),
"PyKMIP does not support this operation")
def test_rsa_order_certificate_from_ordered_container_with_pass(self):
"""Post an order for a certificate"""
order_ref = self.order_container(with_passphrase=True)
@ -293,6 +300,8 @@ class RSATestCase(base.TestCase):
self.verify_certificate_order_status(order_status)
@testcase.attr('positive')
@testtools.skipIf(utils.is_kmip_enabled(),
"PyKMIP does not support this operation")
def test_rsa_order_certificate_from_stored_container_with_pass(self):
"""Post an order for a certificate"""
public_ref = self.store_public_key()

8
functionaltests/api/v1/functional/test_secrets.py
View File

@ -17,6 +17,7 @@ import base64
import binascii
import json
import sys
import testtools
import time
from testtools import testcase
@ -580,6 +581,8 @@ class SecretsTestCase(base.TestCase):
self.assertEqual(resp.status_code, 400)
@testcase.attr('positive', 'non-standard-algorithm')
@testtools.skipIf(utils.is_kmip_enabled(),
"KMIP does not support invalid algorithms")
def test_secret_create_valid_algorithms(self):
"""Creates secrets with various valid algorithms."""
algorithm = 'invalid'
@ -603,6 +606,8 @@ class SecretsTestCase(base.TestCase):
resp, secret_ref = self.behaviors.create_secret(test_model)
self.assertEqual(resp.status_code, 400)
@testtools.skipIf(utils.is_kmip_enabled(),
"KMIP does not support non-standard bit lengths")
@utils.parameterized_dataset({
'sixteen': [16],
'fifteen': [15],
@ -624,8 +629,7 @@ class SecretsTestCase(base.TestCase):
@utils.parameterized_dataset({
'128': [128],
'192': [192],
'256': [256],
'512': [512]
'256': [256]
})
@testcase.attr('positive')
def test_secret_create_with_valid_bit_length(self, bit_length):