vbatts/quay
Archived
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Revert to old secret handling, fix license loading

Browse source
This commit is contained in:
Evan Cordell 2017-06-28 23:15:14 -04:00
parent ef459a2d18
commit d64b8b1fcf
2 changed files with 5 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

6
util/config/provider/test/test_k8sprovider.py
View file

@ -26,8 +26,7 @@ def test_get_volume_path(directory, filename, expected):
@pytest.mark.parametrize('response,expected', [
(Mock(text="{\"license\":\"test\"}", status_code=200), {"license":"test"}),
(Mock(text="{\"data\": {\"license\":\"test\"}}", status_code=200), {"license":"test"}),
(Mock(text="{\"data\": {\"license\":\"test\"}}", status_code=200), {"data": {"license":"test"}}),
(Mock(text="{\"data\": {\"license\":\"test\"}}", status_code=404), None),
])
def test_lookup_secret(response, expected):
@ -37,9 +36,7 @@ def test_lookup_secret(response, expected):
@pytest.mark.parametrize('response,key,expected', [
(Mock(text="{\"license\":\"test\"}", status_code=200), "license", True),
(Mock(text="{\"data\": {\"license\":\"test\"}}", status_code=200), "license", True),
(Mock(text="{\"license\":\"test\"}", status_code=200), "config.yaml", False),
(Mock(text="{\"data\": {\"license\":\"test\"}}", status_code=200), "config.yaml", False),
(Mock(text="", status_code=404), "license", False),
])
@ -50,7 +47,6 @@ def test_volume_file_exists(response, key, expected):
@pytest.mark.parametrize('response,expected', [
(Mock(text="{\"extra_license\":\"test\"}", status_code=200), ["license"]),
(Mock(text="{\"data\": {\"extra_license\":\"test\"}}", status_code=200), ["license"]),
(Mock(text="", status_code=404), []),
])