Skip to content
This repository has been archived by the owner on May 6, 2020. It is now read-only.

fix(controller): Persist ssl.enforce header on service creation #1305

Merged
merged 2 commits into from
Jul 5, 2017

Conversation

mattk42
Copy link
Contributor

@mattk42 mattk42 commented Jun 6, 2017

This is a fix for #1304

@deis-admin
Copy link

Thanks for the contribution! Please ensure your commits follow our style guide. This code will be tested once a Deis maintainer reviews it.

@mboersma
Copy link
Member

mboersma commented Jun 7, 2017

Jenkins, add to whitelist.

@mboersma
Copy link
Member

Thanks @mattk42! This needs a rebase and seems to have failed a unit test:

12:42:45 ======================================================================
12:42:45 FAIL: test_config_set_unicode (api.tests.test_config.ConfigTest)
12:42:45 ----------------------------------------------------------------------
12:42:45 Traceback (most recent call last):
12:42:45   File "/usr/local/lib/python3.5/dist-packages/requests_mock/mocker.py", line 222, in inner
12:42:45     return func(*args, **kwargs)
12:42:45   File "/usr/lib/python3.5/unittest/mock.py", line 1157, in patched
12:42:45     return func(*args, **keywargs)
12:42:45   File "/test/rootfs/api/tests/test_config.py", line 252, in test_config_set_unicode
12:42:45     self.assertEqual(response.status_code, 201, response.data)
12:42:45 AssertionError: 400 != 201 : {'detail': 'duplicate key value violates unique constraint "api_release_app_id_version_e492eaee_uniq"\nDETAIL:  Key (app_id, version)=(17a9703c-d248-4337-9fad-4d39ee1e5f1c, 3) already exists.\n'}

@vdice
Copy link
Member

vdice commented Jul 3, 2017

ping @mattk42 -- any chance to rebase and potentially fix up test(s)?

@mattk42
Copy link
Contributor Author

mattk42 commented Jul 3, 2017 via email

@vdice vdice removed the needs rebase label Jul 5, 2017
@vdice
Copy link
Member

vdice commented Jul 5, 2017

Thanks @mattk42 !

fyi: e2e actually passed (ran right up to the 30 min timeout, but all specs passed): https://ci.deis.io/job/workflow-chart-e2e/391/console

@vdice vdice requested review from mboersma and vdice July 5, 2017 17:35
@vdice vdice added the LGTM1 label Jul 5, 2017
@codecov-io
Copy link

codecov-io commented Jul 5, 2017

Codecov Report

Merging #1305 into master will decrease coverage by 0.11%.
The diff coverage is n/a.

@@            Coverage Diff             @@
##           master    #1305      +/-   ##
==========================================
- Coverage   86.99%   86.88%   -0.12%     
==========================================
  Files          45       45              
  Lines        3929     3941      +12     
  Branches      681      682       +1     
==========================================
+ Hits         3418     3424       +6     
- Misses        339      346       +7     
+ Partials      172      171       -1

@mboersma mboersma merged commit a13133c into deis:master Jul 5, 2017
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants