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

test.test_api_usage: fix secscan tests

Browse source
This commit is contained in:
Jimmy Zelinskie 2017-02-14 14:35:24 -05:00
parent 3286566478
commit 1d6339e644
2 changed files with 27 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
test/test_api_usage.py
View file

@ -4326,7 +4326,6 @@ class TestRepositoryImageSecurity(ApiTestCase):
self.assertEquals(1, image_response['data']['Layer']['IndexedByVersion']) self.assertEquals(1, image_response['data']['Layer']['IndexedByVersion'])
def test_get_vulnerabilities_read_failover(self): def test_get_vulnerabilities_read_failover(self):
with ConfigForTesting():
self.login(ADMIN_ACCESS_USER) self.login(ADMIN_ACCESS_USER)
# Get a layer and mark it as indexed. # Get a layer and mark it as indexed.
@ -4342,7 +4341,7 @@ class TestRepositoryImageSecurity(ApiTestCase):
imageid=layer.docker_image_id, vulnerabilities='true'), imageid=layer.docker_image_id, vulnerabilities='true'),
expected_code=520) expected_code=520)
# Set the failover URL. # Set the failover URL in the global config.
app.config['SECURITY_SCANNER_READONLY_FAILOVER_ENDPOINTS'] = ['http://failoverscanner'] app.config['SECURITY_SCANNER_READONLY_FAILOVER_ENDPOINTS'] = ['http://failoverscanner']
# Configure the API to return 200 for this layer. # Configure the API to return 200 for this layer.
@ -4355,6 +4354,9 @@ class TestRepositoryImageSecurity(ApiTestCase):
imageid=layer.docker_image_id, vulnerabilities='true'), imageid=layer.docker_image_id, vulnerabilities='true'),
expected_code=200) expected_code=200)
# Remove the failover endpoints from the global config.
app.config['SECURITY_SCANNER_READONLY_FAILOVER_ENDPOINTS'] = []
class TestSuperUserCustomCertificates(ApiTestCase): class TestSuperUserCustomCertificates(ApiTestCase):
def test_custom_certificates(self): def test_custom_certificates(self):

4
util/secscan/fake.py
View file

@ -5,6 +5,7 @@ import urlparse
from contextlib import contextmanager from contextlib import contextmanager
from httmock import urlmatch, HTTMock, all_requests from httmock import urlmatch, HTTMock, all_requests
from util.secscan.api import UNKNOWN_PARENT_LAYER_ERROR_MSG, compute_layer_id from util.secscan.api import UNKNOWN_PARENT_LAYER_ERROR_MSG, compute_layer_id
@contextmanager @contextmanager
@ -170,7 +171,6 @@ class FakeSecurityScanner(object):
def get_endpoints(self): def get_endpoints(self):
""" Returns the HTTMock endpoint definitions for the fake security scanner. """ """ Returns the HTTMock endpoint definitions for the fake security scanner. """
@urlmatch(netloc=r'(.*\.)?' + self.hostname, path=r'/v1/layers/(.+)', method='GET') @urlmatch(netloc=r'(.*\.)?' + self.hostname, path=r'/v1/layers/(.+)', method='GET')
def get_layer_mock(url, request): def get_layer_mock(url, request):
layer_id = url.path[len('/v1/layers/'):] layer_id = url.path[len('/v1/layers/'):]
@ -320,7 +320,7 @@ class FakeSecurityScanner(object):
def response_content(url, _): def response_content(url, _):
return { return {
'status_code': 500, 'status_code': 500,
'content': '', 'content': json.dumps({'Error': {'Message': 'Unknown endpoint %s' % url.path}}),
} }
return [get_layer_mock, post_layer_mock, remove_layer_mock, get_notification, return [get_layer_mock, post_layer_mock, remove_layer_mock, get_notification,