summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Dinkjian <thomas.dinkjian@rackspace.com>2015-03-02 14:31:09 -0600
committerThomas Dinkjian <thomas.dinkjian@rackspace.com>2015-03-06 09:46:30 -0600
commit5b71440b67b6f17b648f5cdd915684c986edef18 (patch)
treee7695c56b0511a65c163466b1f15dc80690b4707
parent347d034d4688a8949781303eae5534252840c779 (diff)
downloadpython-barbicanclient-5b71440b67b6f17b648f5cdd915684c986edef18.tar.gz
Moved parameterized test from smoke to functional
There was a parameterized test in our smoke tests section. I have moved the test from smoke to functional. Closes-Bug: #1420868 Change-Id: Idf704925b05a8e8b134a630b73ea849263c48831
-rw-r--r--functionaltests/client/v1/functional/test_secrets.py24
-rw-r--r--functionaltests/client/v1/smoke/test_secrets.py24
2 files changed, 24 insertions, 24 deletions
diff --git a/functionaltests/client/v1/functional/test_secrets.py b/functionaltests/client/v1/functional/test_secrets.py
index b34011a..4a32d54 100644
--- a/functionaltests/client/v1/functional/test_secrets.py
+++ b/functionaltests/client/v1/functional/test_secrets.py
@@ -276,3 +276,27 @@ class SecretsTestCase(base.TestCase):
get_resp = self.behaviors.get_secret(secret_ref)
self.assertIsNotNone(get_resp)
self.assertEqual(get_resp.name, test_model.name)
+
+ @utils.parameterized_dataset({
+ 'alphanumeric': ['1f34ds'],
+ 'punctuation': ['~!@#$%^&*()_+`-={}[]|:;<>,.?'],
+ 'uuid': ['54262d9d-4bc7-4821-8df0-dc2ca8e112bb'],
+ 'len_255': [str(bytearray().zfill(255))],
+ 'empty': [''],
+ 'null': [None]
+ })
+ @testcase.attr('positive')
+ def test_secret_get_defaults_metadata_w_valid_name(self, name):
+ """Covers getting and checking a secret's metadata."""
+ test_model = self.behaviors.create_secret(secret_create_defaults_data)
+ test_model.name = name
+
+ secret_ref = self.behaviors.store_secret(test_model)
+ self.assertIsNotNone(secret_ref)
+
+ get_resp = self.behaviors.get_secret(secret_ref)
+ self.assertEqual(get_resp.status, "ACTIVE")
+ self.assertEqual(get_resp.name, name)
+ self.assertEqual(get_resp.mode, test_model.mode)
+ self.assertEqual(get_resp.algorithm, test_model.algorithm)
+ self.assertEqual(get_resp.bit_length, test_model.bit_length)
diff --git a/functionaltests/client/v1/smoke/test_secrets.py b/functionaltests/client/v1/smoke/test_secrets.py
index 8b7be33..4d436e0 100644
--- a/functionaltests/client/v1/smoke/test_secrets.py
+++ b/functionaltests/client/v1/smoke/test_secrets.py
@@ -68,30 +68,6 @@ class SecretsTestCase(base.TestCase):
secret_ref = self.behaviors.store_secret(test_model)
self.assertIsNotNone(secret_ref)
- @utils.parameterized_dataset({
- 'alphanumeric': ['1f34ds'],
- 'punctuation': ['~!@#$%^&*()_+`-={}[]|:;<>,.?'],
- 'uuid': ['54262d9d-4bc7-4821-8df0-dc2ca8e112bb'],
- 'len_255': [str(bytearray().zfill(255))],
- 'empty': [''],
- 'null': [None]
- })
- @testcase.attr('positive')
- def test_secret_get_defaults_metadata_w_valid_name(self, name):
- """Covers getting and checking a secret's metadata."""
- test_model = self.behaviors.create_secret(secret_create_defaults_data)
- test_model.name = name
-
- secret_ref = self.behaviors.store_secret(test_model)
- self.assertIsNotNone(secret_ref)
-
- get_resp = self.behaviors.get_secret(secret_ref)
- self.assertEqual(get_resp.status, "ACTIVE")
- self.assertEqual(get_resp.name, name)
- self.assertEqual(get_resp.mode, test_model.mode)
- self.assertEqual(get_resp.algorithm, test_model.algorithm)
- self.assertEqual(get_resp.bit_length, test_model.bit_length)
-
@testcase.attr('positive')
def test_secret_delete_defaults(self):
"""Covers deleting a secret."""