airship/deckhand
Code Issues Proposed changes

Fix deckhand-integration-uwsgi-py35 tests

Browse Source 
During Gabbi tests server returns one of

  application/json
  application/json; charset=UTF-8

in a Content-Type HTTP header, depending on which test is being run.
This might be related to different pip/pip3 versions and dependencies
installed being used during standalone vs. containerized tests.

This patch allows for both returned header's values to be accepted as
valid as a remediate solution until versions of packages and pip/pip3
usage is unified.

Change-Id: Ifb8f2d68e3474946b3df154cb016cc18cfc95d23
This commit is contained in:
Roman Gorshunov 2020-02-29 16:45:02 +01:00
parent e7ba6828a0
commit 5241d1d6ea
5 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
deckhand/tests/integration/gabbits/document-crud-secret.yaml
View File

@ -51,7 +51,7 @@ tests:
request_headers:
content-type: application/json
response_headers:
content-type: application/json; charset=UTF-8
content-type: /^application\/json$|^application\/json;\ charset=UTF-8$/
response_json_paths:
$.status: ACTIVE
$.name: my-passphrase
@ -63,7 +63,7 @@ tests:
request_headers:
content-type: application/json
response_headers:
content-type: application/octet-stream; charset=UTF-8
content-type: /^application\/octet-stream|^application\/octet-stream;\ charset=UTF-8/
response_strings:
# base64.b64encode(repr("not-a-real-password"))
- J25vdC1hLXJlYWwtcGFzc3dvcmQn

4
deckhand/tests/integration/gabbits/document-render-secret-edge-cases.yaml
View File

@ -66,7 +66,7 @@ tests:
request_headers:
content-type: application/json
response_headers:
content-type: application/json; charset=UTF-8
content-type: /^application\/json$|^application\/json;\ charset=UTF-8$/
response_json_paths:
$.secrets.`len`: 0
$.secrets: []
@ -151,7 +151,7 @@ tests:
request_headers:
content-type: application/json
response_headers:
content-type: application/json; charset=UTF-8
content-type: /^application\/json$|^application\/json;\ charset=UTF-8$/
response_json_paths:
$.status: ACTIVE
$.name: armada-doc

2
deckhand/tests/integration/gabbits/document-substitution-secret-generic.yaml
View File

@ -88,7 +88,7 @@ tests:
request_headers:
content-type: application/json
response_headers:
content-type: application/json; charset=UTF-8
content-type: /^application\/json$|^application\/json;\ charset=UTF-8$/
response_json_paths:
$.status: ACTIVE
$.name: example-armada-cert

2
deckhand/tests/integration/gabbits/document-substitution-secret.yaml
View File

@ -202,7 +202,7 @@ tests:
request_headers:
content-type: application/json
response_headers:
content-type: application/json; charset=UTF-8
content-type: /^application\/json$|^application\/json;\ charset=UTF-8$/
response_json_paths:
$.secrets.`len`: 7
$.secrets[*].status:

6
deckhand/tests/integration/gabbits/revision-delete-all-secrets.yaml
View File

@ -49,7 +49,7 @@ tests:
request_headers:
X-Auth-Token: $ENVIRON['TEST_AUTH_TOKEN']
response_headers:
content-type: application/json; charset=UTF-8
content-type: /^application\/json$|^application\/json;\ charset=UTF-8$/
response_json_paths:
$.status: ACTIVE
@ -60,7 +60,7 @@ tests:
request_headers:
X-Auth-Token: $ENVIRON['TEST_AUTH_TOKEN']
response_headers:
content-type: application/octet-stream; charset=UTF-8
content-type: /^application\/octet-stream$|^application\/octet-stream;\ charset=UTF-8$/
response_strings:
# base64.b64encode(repr("not-a-real-password"))
- J25vdC1hLXJlYWwtcGFzc3dvcmQn
@ -82,7 +82,7 @@ tests:
request_headers:
X-Auth-Token: $ENVIRON['TEST_AUTH_TOKEN']
response_headers:
content-type: application/json; charset=UTF-8
content-type: /^application\/json$|^application\/json;\ charset=UTF-8$/
response_json_paths:
$.secrets.`len`: 0
$.secrets: []