Commit cd8883f6 authored by Łukasz Nowak's avatar Łukasz Nowak

squash! XXX rapid-cdn: Rewrite test backend

Just an example of how tests shall be rewritten.

Also backend is backward compatible in old bad way, with representing
headers as a dict instead of sorted list of lists.
parent 093b1304
Pipeline #38145 failed with stage
in 0 seconds
...@@ -607,8 +607,9 @@ class TestHandler(BaseHTTPRequestHandler): ...@@ -607,8 +607,9 @@ class TestHandler(BaseHTTPRequestHandler):
header_name[len(config_header_header):], header_value) header_name[len(config_header_header):], header_value)
elif header_name.startswith(config_header): elif header_name.startswith(config_header):
config[header_name[len(config_header):]] = header_value config[header_name[len(config_header):]] = header_value
config['Body'] = self.rfile.read(int(self.headers.get( if 'X-Config-Body' not in self.headers:
'Content-Length', '0'))) config['Body'] = self.rfile.read(int(self.headers.get(
'Content-Length', '0')))
self.send_response(201) self.send_response(201)
self.send_header("Content-Type", "application/json") self.send_header("Content-Type", "application/json")
self.end_headers() self.end_headers()
...@@ -624,10 +625,28 @@ class TestHandler(BaseHTTPRequestHandler): ...@@ -624,10 +625,28 @@ class TestHandler(BaseHTTPRequestHandler):
return self.do_GET() return self.do_GET()
def do_GET(self): def do_GET(self):
def generateDefaultResponse():
header_dict = {}
for header in list(self.headers.keys()):
content = self.headers.get_all(header)
if len(content) == 0:
header_dict[header] = None
elif len(content) == 1:
header_dict[header] = content[0]
else:
header_dict[header] = content
return json.dumps(
{
'Path': self.path,
'Incoming Headers': header_dict
},
indent=2).encode()
config = self.configuration.get(self.path, None) config = self.configuration.get(self.path, None)
if config is None: if config is None:
self.send_response(404) self.send_response(404)
response = json.dumps({'path': self.path}, indent=2).encode() response = generateDefaultResponse()
self.send_header('Content-Length', len(response)) self.send_header('Content-Length', len(response))
self.send_header('Content-Type', 'application/json') self.send_header('Content-Type', 'application/json')
self.end_headers() self.end_headers()
...@@ -637,6 +656,10 @@ class TestHandler(BaseHTTPRequestHandler): ...@@ -637,6 +656,10 @@ class TestHandler(BaseHTTPRequestHandler):
self.protocol_version = config['configuration']['Protocol-Version'] self.protocol_version = config['configuration']['Protocol-Version']
time.sleep(int(config['configuration']['Timeout'])) time.sleep(int(config['configuration']['Timeout']))
self.send_response_only(int(config['configuration']['Status-Code'])) self.send_response_only(int(config['configuration']['Status-Code']))
if config['configuration']['Body'] == 'calculate':
body = generateDefaultResponse()
else:
body = config['configuration']['Body']
for header, value in config['headers'].items(): for header, value in config['headers'].items():
for header_type in ['Date', 'Last-Modified']: for header_type in ['Date', 'Last-Modified']:
if header == header_type: if header == header_type:
...@@ -649,10 +672,10 @@ class TestHandler(BaseHTTPRequestHandler): ...@@ -649,10 +672,10 @@ class TestHandler(BaseHTTPRequestHandler):
) )
if header == 'Content-Length': if header == 'Content-Length':
if value == 'calculate': if value == 'calculate':
value = '%s' % (len(config['configuration']['Body']),) value = '%s' % (len(body),)
self.send_header(header, value) self.send_header(header, value)
self.end_headers() self.end_headers()
self.wfile.write(config['configuration']['Body']) self.wfile.write(body)
class HttpFrontendTestCase(SlapOSInstanceTestCase): class HttpFrontendTestCase(SlapOSInstanceTestCase):
...@@ -2334,11 +2357,16 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin, AtsMixin): ...@@ -2334,11 +2357,16 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin, AtsMixin):
} }
) )
path = '/test-path/deep/.././deeper' * 250 path = '/test-path/deep/.././deeper' * 250
backend_url = self.getSlaveParameterDictDict()['Url']['url'] backend_path = '/test-path/deeper' * 250
config_result = mimikra.config( config_result = mimikra.config(
backend_url + path, self.backend_url.rstrip('/') + '?a=b&c=' + backend_path,
headers=setUpHeaders([ headers=setUpHeaders([
('X-Config-Timeout', '10') ('X-Config-Timeout', '10'),
('X-Config-Body', 'calculate'),
('X-Config-Reply-Header-Server', 'TestBackend'),
('X-Config-Reply-Header-Content-Length', 'calculate'),
('X-Config-Reply-Header-Via', 'http/1.1 backendvia'),
('X-Config-Reply-Header-Set-Cookie', 'secured=value;secure, nonsecured=value'),
]) ])
) )
self.assertEqual(config_result.status_code, http.client.CREATED) self.assertEqual(config_result.status_code, http.client.CREATED)
...@@ -2358,14 +2386,13 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin, AtsMixin): ...@@ -2358,14 +2386,13 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin, AtsMixin):
headers = self.assertResponseHeaders(result) headers = self.assertResponseHeaders(result)
self.assertNotIn('Strict-Transport-Security', headers) self.assertNotIn('Strict-Transport-Security', headers)
self.assertEqualResultJson( self.assertEqualResultJson(
result, 'Path', '?a=b&c=' + '/test-path/deeper' * 250) result, 'Path', '/?a=b&c=' + '/test-path/deeper' * 250)
try: try:
j = result.json() j = result.json()
except Exception: except Exception:
raise ValueError('JSON decode problem in:\n%s' % (result.text,)) raise ValueError('JSON decode problem in:\n%s' % (result.text,))
self.assertEqual(j['Incoming Headers']['timeout'], '10')
self.assertFalse('Content-Encoding' in headers) self.assertFalse('Content-Encoding' in headers)
self.assertRequestHeaders(j['Incoming Headers'], parameter_dict['domain']) self.assertRequestHeaders(j['Incoming Headers'], parameter_dict['domain'])
...@@ -2527,7 +2554,6 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin, AtsMixin): ...@@ -2527,7 +2554,6 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin, AtsMixin):
except Exception: except Exception:
raise ValueError('JSON decode problem in:\n%s' % (result.text,)) raise ValueError('JSON decode problem in:\n%s' % (result.text,))
self.assertEqual(j['Incoming Headers']['timeout'], '10')
self.assertFalse('Content-Encoding' in result.headers) self.assertFalse('Content-Encoding' in result.headers)
self.assertRequestHeaders( self.assertRequestHeaders(
j['Incoming Headers'], parameter_dict['domain']) j['Incoming Headers'], parameter_dict['domain'])
...@@ -2608,7 +2634,6 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin, AtsMixin): ...@@ -2608,7 +2634,6 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin, AtsMixin):
except Exception: except Exception:
raise ValueError('JSON decode problem in:\n%s' % (result.text,)) raise ValueError('JSON decode problem in:\n%s' % (result.text,))
self.assertEqual(j['Incoming Headers']['timeout'], '10')
self.assertFalse('Content-Encoding' in result.headers) self.assertFalse('Content-Encoding' in result.headers)
self.assertRequestHeaders(j['Incoming Headers'], parameter_dict['domain']) self.assertRequestHeaders(j['Incoming Headers'], parameter_dict['domain'])
...@@ -2806,7 +2831,6 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin, AtsMixin): ...@@ -2806,7 +2831,6 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin, AtsMixin):
except Exception: except Exception:
raise ValueError('JSON decode problem in:\n%s' % (result.text,)) raise ValueError('JSON decode problem in:\n%s' % (result.text,))
self.assertEqual(j['Incoming Headers']['timeout'], '10')
self.assertFalse('Content-Encoding' in result.headers) self.assertFalse('Content-Encoding' in result.headers)
self.assertRequestHeaders(j['Incoming Headers'], parameter_dict['domain']) self.assertRequestHeaders(j['Incoming Headers'], parameter_dict['domain'])
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment