diff options
| author | Chellygel <chelsea.winfree@gmail.com> | 2015-03-17 16:08:19 -0500 |
|---|---|---|
| committer | Chellygel <chelsea.winfree@gmail.com> | 2015-03-18 11:41:01 -0500 |
| commit | ca7ad3ae02c1ea55be1deab078f8793880e86489 (patch) | |
| tree | d3579c9a226902c2c001038a01f336e270dde04b | |
| parent | 01256d03770ee0bd666dbc44c401abd6ccf825f6 (diff) | |
| download | python-barbicanclient-ca7ad3ae02c1ea55be1deab078f8793880e86489.tar.gz | |
Fix smoke test for client with bad data set
Change-Id: Ib7771d4fde8bfab17f743e7935e7089a3e00bb93
| -rw-r--r-- | functionaltests/client/v1/functional/test_secrets.py | 3 | ||||
| -rw-r--r-- | functionaltests/client/v1/smoke/test_secrets.py | 11 |
2 files changed, 5 insertions, 9 deletions
diff --git a/functionaltests/client/v1/functional/test_secrets.py b/functionaltests/client/v1/functional/test_secrets.py index 6cf37f1..ad006c4 100644 --- a/functionaltests/client/v1/functional/test_secrets.py +++ b/functionaltests/client/v1/functional/test_secrets.py @@ -78,8 +78,7 @@ class SecretsTestCase(base.TestCase): content_types = resp.content_types self.assertIsNotNone(content_types) self.assertIn('default', content_types) - self.assertEqual(content_types['default'], - test_model.payload_content_type) + self.assertEqual('application/octet-stream', content_types['default']) @testcase.attr('positive') def test_secret_create_defaults_non_standard_algorithm(self): diff --git a/functionaltests/client/v1/smoke/test_secrets.py b/functionaltests/client/v1/smoke/test_secrets.py index 4d436e0..e9387a6 100644 --- a/functionaltests/client/v1/smoke/test_secrets.py +++ b/functionaltests/client/v1/smoke/test_secrets.py @@ -23,9 +23,7 @@ secret_create_defaults_data = { "algorithm": "aes", "bit_length": 256, "mode": "cbc", - "payload": "gF6+lLoF3ohA9aPRpt+6bQ==", - "payload_content_type": "application/octet-stream", - "payload_content_encoding": "base64", + "payload": "gF6+lLoF3ohA9aPRpt+6bQ==" } secret_create_nones_data = { @@ -93,13 +91,12 @@ class SecretsTestCase(base.TestCase): def test_secret_get_defaults_payload(self): """Covers getting a secret's payload data.""" test_model = self.behaviors.create_secret(secret_create_defaults_data) - secret_ref = self.behaviors.store_secret(test_model) get_resp = self.behaviors.get_secret( - secret_ref, - payload_content_type=test_model.payload_content_type) - self.assertEqual(get_resp.payload, test_model.payload) + secret_ref + ) + self.assertEqual(test_model.payload, get_resp.payload) @testcase.attr('positive') def test_secrets_get_defaults_multiple_secrets(self): |