Skip to content

slapos
slapos
Commit a465be43 authored by Łukasz Nowak's avatar Łukasz Nowak
Browse files
Options

XXX rapid-cdn: Rewrite test backend 

XXX:
 * improve it more
 * adapt tests

Test backend needs to mimic all possible real backend cases.

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 ed5aa6d8
Hide whitespace changes
Inline Side-by-side
Showing with 215 additions and 191 deletions
software/rapid-cdn/test/test.py
View file @ a465be43
...@@ -40,8 +40,6 @@ from socketserver import ThreadingMixIn ...@@ -40,8 +40,6 @@ from socketserver import ThreadingMixIn
import time import time
import tempfile import tempfile
import ipaddress import ipaddress
import io
import gzip
import base64 import base64
import re import re
from slapos.recipe.librecipe import generateHashFromFiles from slapos.recipe.librecipe import generateHashFromFiles
...@@ -51,8 +49,6 @@ import socket ...@@ -51,8 +49,6 @@ import socket
import sys import sys
import logging import logging
import lzma import lzma
import random
import string
from slapos.slap.standalone import SlapOSNodeInstanceError from slapos.slap.standalone import SlapOSNodeInstanceError
import caucase.client import caucase.client
import caucase.utils import caucase.utils
...@@ -242,6 +238,13 @@ def subprocess_output(*args, **kwargs): ...@@ -242,6 +238,13 @@ def subprocess_output(*args, **kwargs):
return subprocess_status_output(*args, **kwargs)[1] return subprocess_status_output(*args, **kwargs)[1]
def setUpHeaders(header_list_list):
result = http.client.HTTPMessage()
for header, value in header_list_list:
result.add_header(header, value)
return result
mimikra = Recurls() mimikra = Recurls()
...@@ -499,20 +502,29 @@ class TestDataMixin(object): ...@@ -499,20 +502,29 @@ class TestDataMixin(object):
self.assertTestData(json_data, data_replacement_dict=data_replacement_dict) self.assertTestData(json_data, data_replacement_dict=data_replacement_dict)
def fakeHTTPSResult(domain, path, port=HTTPS_PORT, def fakeSetupHeaders(headers):
headers=None, source_ip=SOURCE_IP):
if headers is None: if headers is None:
headers = {} headers = http.client.HTTPMessage()
# workaround request problem of setting Accept-Encoding default_header_dict = {
# https://github.com/requests/requests/issues/2234 # workaround request problem of setting Accept-Encoding
headers.setdefault('Accept-Encoding', 'dummy') # https://github.com/requests/requests/issues/2234
# Headers to tricks the whole system, like rouge user would do 'Accept-Encoding': 'dummy',
headers.setdefault('X-Forwarded-For', '192.168.0.1') # Headers to tricks the whole system, like rouge user would do
headers.setdefault('X-Forwarded-Proto', 'irc') 'X-Forwarded-For': '192.168.0.1',
headers.setdefault('X-Forwarded-Port', '17') 'X-Forwarded-Proto': 'irc',
# Expose some Via to show how nicely it arrives to the backend 'X-Forwarded-Port': '17',
headers.setdefault('Via', 'http/1.1 clientvia') # Expose some Via to show how nicely it arrives to the backend
'Via': 'http/1.1 clientvia'
}
for header_name, header_value in default_header_dict.items():
if header_name not in headers:
headers.add_header(header_name, header_value)
return headers
def fakeHTTPSResult(domain, path, port=HTTPS_PORT,
headers=None, source_ip=SOURCE_IP):
headers = fakeSetupHeaders(headers)
url = 'https://%s:%s/%s' % (domain, port, path) url = 'https://%s:%s/%s' % (domain, port, path)
return mimikra.get( return mimikra.get(
...@@ -535,18 +547,9 @@ def fakeHTTPSResult(domain, path, port=HTTPS_PORT, ...@@ -535,18 +547,9 @@ def fakeHTTPSResult(domain, path, port=HTTPS_PORT,
def fakeHTTPResult(domain, path, port=HTTP_PORT, def fakeHTTPResult(domain, path, port=HTTP_PORT,
headers=None, source_ip=SOURCE_IP): headers=None, source_ip=SOURCE_IP):
if headers is None: headers = fakeSetupHeaders(headers)
headers = {} if 'Host' not in headers:
# workaround request problem of setting Accept-Encoding headers.add_header('Host', '%s:%s' % (domain, port))
# https://github.com/requests/requests/issues/2234
headers.setdefault('Accept-Encoding', 'dummy')
# Headers to tricks the whole system, like rouge user would do
headers.setdefault('X-Forwarded-For', '192.168.0.1')
headers.setdefault('X-Forwarded-Proto', 'irc')
headers.setdefault('X-Forwarded-Port', '17')
# Expose some Via to show how nicely it arrives to the backend
headers.setdefault('Via', 'http/1.1 clientvia')
headers['Host'] = '%s:%s' % (domain, port)
url = 'http://%s:%s/%s' % (TEST_IP, port, path) url = 'http://%s:%s/%s' % (TEST_IP, port, path)
return mimikra.get( return mimikra.get(
url, url,
...@@ -560,12 +563,25 @@ def fakeHTTPResult(domain, path, port=HTTP_PORT, ...@@ -560,12 +563,25 @@ def fakeHTTPResult(domain, path, port=HTTP_PORT,
) )
class ConfigurationReplyEncoder(json.JSONEncoder):
def default(self, obj):
if isinstance(obj, bytes):
return '<%i>' % (len(obj))
elif isinstance(obj, http.client.HTTPMessage):
reply = ''
for k, v in obj.items():
reply += '%r: %r' % (k, v)
return reply
return json.JSONEncoder.default(self, obj)
class TestHandler(BaseHTTPRequestHandler): class TestHandler(BaseHTTPRequestHandler):
identification = None
configuration = {} configuration = {}
# override Server header response DEFAULT_CONFIGURATION = {
server_version = "TestBackend" 'Status-Code': '200',
sys_version = "" 'Protocol-Version': 'HTTP/1.0',
'Timeout': '0',
}
log_message = logging.getLogger(__name__ + '.TestHandler').info log_message = logging.getLogger(__name__ + '.TestHandler').info
...@@ -580,127 +596,92 @@ class TestHandler(BaseHTTPRequestHandler): ...@@ -580,127 +596,92 @@ class TestHandler(BaseHTTPRequestHandler):
self.end_headers() self.end_headers()
self.wfile.write(json.dumps({self.path: config}, indent=2)) self.wfile.write(json.dumps({self.path: config}, indent=2))
def do_PUT(self): def do_CONFIG(self):
incoming_config = {} config = self.DEFAULT_CONFIGURATION.copy()
for key, value in list(self.headers.items()): incoming_headers = http.client.HTTPMessage()
if key.startswith('X-'): config_header = 'X-Config-'
incoming_config[key] = value config_header_header = 'X-Config-Reply-Header-'
config = { for header_name, header_value in self.headers.items():
'status_code': incoming_config.pop('X-Reply-Status-Code', '200') if header_name.startswith(config_header_header):
} incoming_headers.add_header(
prefix = 'X-Reply-Header-' header_name[len(config_header_header):], header_value)
length = len(prefix) elif header_name.startswith(config_header):
for key in list(incoming_config.keys()): config[header_name[len(config_header):]] = header_value
if key.startswith(prefix): if 'X-Config-Body' not in self.headers:
header = '-'.join([q.capitalize() for q in key[length:].split('-')]) config['Body'] = self.rfile.read(int(self.headers.get(
config[header] = incoming_config.pop(key) 'Content-Length', '0')))
if 'X-Reply-Body' in incoming_config:
config['Body'] = base64.b64decode(
incoming_config.pop('X-Reply-Body')).decode()
config['X-Drop-Header'] = incoming_config.pop('X-Drop-Header', None)
self.configuration[self.path] = config
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()
reply = {self.path: config} self.configuration[self.path] = {
if incoming_config: 'headers': incoming_headers,
reply['unknown_config'] = incoming_config 'configuration': config
self.wfile.write(json.dumps(reply, indent=2).encode()) }
reply = {self.path: dict(self.configuration[self.path])}
self.wfile.write(json.dumps(
reply, indent=2, cls=ConfigurationReplyEncoder).encode())
def do_POST(self): def do_POST(self):
return self.do_GET() return self.do_GET()
def do_GET(self): def do_GET(self):
config = self.configuration.get(self.path, None) def generateDefaultResponse():
if config is not None:
config = config.copy()
response = config.pop('Body', None)
status_code = int(config.pop('status_code'))
timeout = int(config.pop('Timeout', '0'))
compress = int(config.pop('Compress', '0'))
drop_header_list = []
for header in (config.pop('X-Drop-Header') or '').split():
drop_header_list.append(header)
header_dict = config
else:
drop_header_list = []
for header in (self.headers.get('x-drop-header') or '').split():
drop_header_list.append(header)
response = None
status_code = 200
timeout = int(self.headers.get('timeout', '0'))
if 'x-maximum-timeout' in self.headers:
maximum_timeout = int(self.headers['x-maximum-timeout'])
timeout = random.randrange(maximum_timeout)
if 'x-response-size' in self.headers:
min_response, max_response = [
int(q) for q in self.headers['x-response-size'].split(' ')]
reponse_size = random.randrange(min_response, max_response)
response = ''.join(
random.choice(string.lowercase) for x in range(reponse_size))
compress = int(self.headers.get('compress', '0'))
header_dict = {} header_dict = {}
prefix = 'x-reply-header-' for header in list(self.headers.keys()):
length = len(prefix) content = self.headers.get_all(header)
for key, value in list(self.headers.items()): if len(content) == 0:
if key.startswith(prefix): header_dict[header] = None
header = '-'.join([q.capitalize() for q in key[length:].split('-')]) elif len(content) == 1:
header_dict[header] = value.strip() header_dict[header] = content[0]
if response is None: else:
if 'x-reply-body' not in self.headers: header_dict[header] = content
headers_dict = dict()
for header in list(self.headers.keys()):
content = self.headers.get_all(header)
if len(content) == 0:
headers_dict[header] = None
elif len(content) == 1:
headers_dict[header] = content[0]
else:
headers_dict[header] = content
response = {
'Path': self.path,
'Incoming Headers': headers_dict
}
response = json.dumps(response, indent=2)
else:
response = base64.b64decode(self.headers['x-reply-body'])
time.sleep(timeout)
self.send_response_only(status_code)
self.send_header('Server', self.server_version)
for key, value in list(header_dict.items()):
self.send_header(key, value)
if self.identification is not None: return json.dumps(
self.send_header('X-Backend-Identification', self.identification) {
'Path': self.path,
'Incoming Headers': header_dict
},
indent=2).encode()
if 'Content-Type' not in drop_header_list: identification = getattr(self, 'identification', None)
self.send_header("Content-Type", "application/json") config = self.configuration.get(self.path, None)
if 'Set-Cookie' not in drop_header_list: if config is None:
self.send_header('Set-Cookie', 'secured=value;secure') self.send_response(404)
self.send_header('Set-Cookie', 'nonsecured=value') response = generateDefaultResponse()
if 'Via' not in drop_header_list:
self.send_header('Via', 'http/1.1 backendvia')
if compress:
self.send_header('Content-Encoding', 'gzip')
out = io.BytesIO()
# compress with level 0, to find out if in the middle someting would
# like to alter the compression
with gzip.GzipFile(fileobj=out, mode="wb", compresslevel=0) as f:
f.write(response.encode())
response = out.getvalue()
self.send_header('Backend-Content-Length', len(response))
if 'Content-Length' not in drop_header_list:
self.send_header('Content-Length', len(response)) self.send_header('Content-Length', len(response))
self.send_header('Content-Type', 'application/json')
if identification is not None:
self.send_header('X-Backend-Identification', identification)
self.end_headers()
self.wfile.write(response)
return
self.protocol_version = config['configuration']['Protocol-Version']
time.sleep(int(config['configuration']['Timeout']))
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_type in ['Date', 'Last-Modified']:
if header == header_type:
if value == 'now':
value = self.date_time_string()
if header == 'Expires':
if value.startswith('delta:'):
value = self.date_time_string(
time.time() + float(value.split(':')[1])
)
if header == 'Content-Length':
if value == 'calculate':
value = '%s' % (len(body),)
self.send_header(header, value)
if identification is not None:
if 'X-Backend-Identification' not in config['headers']:
self.send_header('X-Backend-Identification', identification)
self.end_headers() self.end_headers()
if getattr(response, 'encode', None) is not None: self.wfile.write(body)
response = response.encode()
self.wfile.write(response)
class HttpFrontendTestCase(SlapOSInstanceTestCase): class HttpFrontendTestCase(SlapOSInstanceTestCase):
...@@ -984,49 +965,66 @@ class HttpFrontendTestCase(SlapOSInstanceTestCase): ...@@ -984,49 +965,66 @@ class HttpFrontendTestCase(SlapOSInstanceTestCase):
client_version = self.max_client_version client_version = self.max_client_version
if alt_svc is None: if alt_svc is None:
alt_svc = self.alt_svc alt_svc = self.alt_svc
headers = result.headers.copy() pop_header_list = []
self.assertKeyWithPop('Content-Length', headers)
if 'Connection' in headers and headers[ def assertSingleHeader(header):
'Connection'].lower() == 'keep-alive': value_list = result.headers.get_all(header, [])
headers.pop('Connection') self.assertEqual(1, len(value_list))
return value_list[0]
def assertAndPopSingleHeader(header):
pop_header_list.append(header.lower())
return assertSingleHeader(header)
assertAndPopSingleHeader('Content-Length')
if 'Connection' in result.headers:
if assertSingleHeader().lower() == 'keep-alive':
pop_header_list.append('Connection'.lower())
if alt_svc: if alt_svc:
self.assertEqual( self.assertEqual(
'h3=":%s"; ma=3600' % (HTTPS_PORT,), 'h3=":%s"; ma=3600' % (HTTPS_PORT,),
headers.pop('Alt-Svc', '') assertAndPopSingleHeader('Alt-Svc')
) )
self.assertEqual( self.assertEqual(
'%s:quic' % (HTTPS_PORT,), '%s:quic' % (HTTPS_PORT,),
headers.pop('Alternate-Protocol', '') assertAndPopSingleHeader('Alternate-Protocol')
) )
if backend_reached: if backend_reached:
self.assertEqual('TestBackend', headers.pop('Server', '')) self.assertEqual('TestBackend', assertAndPopSingleHeader('Server'))
self.assertKeyWithPop('Date', headers) assertAndPopSingleHeader('Date')
via_id = '%s-%s' % ( via_id = '%s-%s' % (
self.node_information_dict['node-id'], self.node_information_dict['node-id'],
list(self.node_information_dict['version-hash-history'].keys())[0]) list(self.node_information_dict['version-hash-history'].keys())[0])
if via: if via:
self.assertIn('Via', headers) pop_header_list.append('Via'.lower())
via = ' '.join(result.headers.get_all('Via'))
if cached: if cached:
self.assertEqual( self.assertEqual(
'http/1.1 backendvia, ' 'http/1.1 backendvia '
'HTTP/1.1 rapid-cdn-backend-%(via_id)s, ' 'HTTP/1.1 rapid-cdn-backend-%(via_id)s, ' # ATS adds to existing
'http/1.0 rapid-cdn-cache-%(via_id)s, ' # header, so ","
'http/1.0 rapid-cdn-cache-%(via_id)s '
'HTTP/%(client_version)s rapid-cdn-frontend-%(via_id)s' % dict( 'HTTP/%(client_version)s rapid-cdn-frontend-%(via_id)s' % dict(
via_id=via_id, client_version=client_version), via_id=via_id, client_version=client_version),
headers.pop('Via') via
) )
else: else:
self.assertEqual( self.assertEqual(
'http/1.1 backendvia, ' 'http/1.1 backendvia '
'HTTP/1.1 rapid-cdn-backend-%(via_id)s, ' 'HTTP/1.1 rapid-cdn-backend-%(via_id)s '
'HTTP/%(client_version)s rapid-cdn-frontend-%(via_id)s' % dict( 'HTTP/%(client_version)s rapid-cdn-frontend-%(via_id)s' % dict(
via_id=via_id, client_version=client_version), via_id=via_id, client_version=client_version),
headers.pop('Via') via
) )
else: else:
self.assertNotIn('Via', headers) self.assertNotIn('Via', result.headers)
headers = http.client.HTTPMessage()
for header, value in result.headers.items():
if header not in pop_header_list:
headers.add_header(header, value)
return headers return headers
def assertLogAccessUrlWithPop(self, parameter_dict): def assertLogAccessUrlWithPop(self, parameter_dict):
...@@ -2364,14 +2362,27 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin, AtsMixin): ...@@ -2364,14 +2362,27 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin, AtsMixin):
self.backend_url, self.backend_url)], self.backend_url, self.backend_url)],
} }
) )
path = '/test-path/deep/.././deeper' * 250
backend_path = '/test-path/deeper' * 250
config_result = mimikra.config(
self.backend_url.rstrip('/') + '?a=b&c=' + backend_path,
headers=setUpHeaders([
('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)
result = fakeHTTPSResult( result = fakeHTTPSResult(
parameter_dict['domain'], parameter_dict['domain'],
'/test-path/deep/.././deeper' * 250, path,
headers={ headers=setUpHeaders([
'Timeout': '10', # more than default backend-connect-timeout == 5 ('Accept-Encoding', 'gzip'),
'Accept-Encoding': 'gzip', ('User-Agent', 'TEST USER AGENT'),
'User-Agent': 'TEST USER AGENT', ])
}
) )
self.assertEqual( self.assertEqual(
...@@ -2381,14 +2392,13 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin, AtsMixin): ...@@ -2381,14 +2392,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'])
...@@ -2512,6 +2522,15 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin, AtsMixin): ...@@ -2512,6 +2522,15 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin, AtsMixin):
def test_auth_to_backend(self): def test_auth_to_backend(self):
parameter_dict = self.assertSlaveBase('auth-to-backend') parameter_dict = self.assertSlaveBase('auth-to-backend')
path = 'test-path/deep/.././deeper'
backend_url = self.getSlaveParameterDictDict()['auth-to-backend']['url']
config_result = mimikra.config(
backend_url + path,
headers=setUpHeaders([
('X-Config-Timeout', '10')
])
)
self.assertEqual(config_result.status_code, http.client.CREATED)
self.startAuthenticatedServerProcess() self.startAuthenticatedServerProcess()
try: try:
# assert that you can't fetch nothing without key # assert that you can't fetch nothing without key
...@@ -2524,11 +2543,10 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin, AtsMixin): ...@@ -2524,11 +2543,10 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin, AtsMixin):
# (so it means that auth to backend worked) # (so it means that auth to backend worked)
result = fakeHTTPSResult( result = fakeHTTPSResult(
parameter_dict['domain'], parameter_dict['domain'],
'test-path/deep/.././deeper', path,
headers={ headers=setUpHeaders([
'Timeout': '10', # more than default backend-connect-timeout == 5 ('Accept-Encoding', 'gzip'),
'Accept-Encoding': 'gzip', ])
}
) )
self.assertEqual( self.assertEqual(
...@@ -2542,7 +2560,6 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin, AtsMixin): ...@@ -2542,7 +2560,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'])
...@@ -2561,6 +2578,16 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin, AtsMixin): ...@@ -2561,6 +2578,16 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin, AtsMixin):
def test_auth_to_backend_not_configured(self): def test_auth_to_backend_not_configured(self):
parameter_dict = self.assertSlaveBase('auth-to-backend-not-configured') parameter_dict = self.assertSlaveBase('auth-to-backend-not-configured')
path = 'test-path/deep/.././deeper'
backend_url = self.getSlaveParameterDictDict()[
'auth-to-backend-not-configured']['url']
config_result = mimikra.config(
backend_url + path,
headers=setUpHeaders([
('X-Config-Timeout', '10')
])
)
self.assertEqual(config_result.status_code, http.client.CREATED)
self.startAuthenticatedServerProcess() self.startAuthenticatedServerProcess()
try: try:
# assert that you can't fetch nothing without key # assert that you can't fetch nothing without key
...@@ -2573,11 +2600,10 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin, AtsMixin): ...@@ -2573,11 +2600,10 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin, AtsMixin):
# (so it means that auth to backend worked) # (so it means that auth to backend worked)
result = fakeHTTPSResult( result = fakeHTTPSResult(
parameter_dict['domain'], parameter_dict['domain'],
'test-path/deep/.././deeper', path,
headers={ headers=setUpHeaders([
'Timeout': '10', # more than default backend-connect-timeout == 5 ('Accept-Encoding', 'gzip'),
'Accept-Encoding': 'gzip', ])
}
) )
self.assertEqual( self.assertEqual(
...@@ -2614,7 +2640,6 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin, AtsMixin): ...@@ -2614,7 +2640,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'])
...@@ -2812,7 +2837,6 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin, AtsMixin): ...@@ -2812,7 +2837,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'])
...@@ -4061,7 +4085,7 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin, AtsMixin): ...@@ -4061,7 +4085,7 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin, AtsMixin):
def configureResult(status_code, body): def configureResult(status_code, body):
backend_url = self.getSlaveParameterDictDict()['enable_cache']['url'] backend_url = self.getSlaveParameterDictDict()['enable_cache']['url']
result = mimikra.put(backend_url + path, headers={ result = mimikra.config(backend_url + path, headers={
'X-Reply-Header-Cache-Control': 'max-age=%s, public' % (max_age,), 'X-Reply-Header-Cache-Control': 'max-age=%s, public' % (max_age,),
'X-Reply-Status-Code': status_code, 'X-Reply-Status-Code': status_code,
'X-Reply-Body': base64.b64encode(body.encode()).decode(), 'X-Reply-Body': base64.b64encode(body.encode()).decode(),
...@@ -4832,7 +4856,7 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin, AtsMixin): ...@@ -4832,7 +4856,7 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin, AtsMixin):
normal_path = 'normal' normal_path = 'normal'
with_date_path = 'with_date' with_date_path = 'with_date'
specific_date = 'Fri, 07 Dec 2001 00:00:00 GMT' specific_date = 'Fri, 07 Dec 2001 00:00:00 GMT'
result_configure = mimikra.put( result_configure = mimikra.config(
backend_url + '/' + with_date_path, headers={ backend_url + '/' + with_date_path, headers={
'X-Reply-Header-Date': specific_date 'X-Reply-Header-Date': specific_date
}) })
...@@ -7162,7 +7186,7 @@ backend _health-check-default-http ...@@ -7162,7 +7186,7 @@ backend _health-check-default-http
'failover-url?a=b&c=', 'failover-url?a=b&c=',
'failover-https-url?a=b&c=' 'failover-https-url?a=b&c='
]: ]:
result = mimikra.put( result = mimikra.config(
self.backend_url + url + path, self.backend_url + url + path,
headers={ headers={
'X-Reply-Status-Code': '503', 'X-Reply-Status-Code': '503',
...@@ -7173,7 +7197,7 @@ backend _health-check-default-http ...@@ -7173,7 +7197,7 @@ backend _health-check-default-http
def configureResult(status_code, body): def configureResult(status_code, body):
backend_url = self.getSlaveParameterDictDict()[ backend_url = self.getSlaveParameterDictDict()[
'health-check-failover-url']['https-url'] 'health-check-failover-url']['https-url']
result = mimikra.put( result = mimikra.config(
'/'.join([backend_url, cached_path]), '/'.join([backend_url, cached_path]),
headers={ headers={
'X-Reply-Header-Cache-Control': 'max-age=%s, public' % (max_age,), 'X-Reply-Header-Cache-Control': 'max-age=%s, public' % (max_age,),
...@@ -7204,14 +7228,14 @@ backend _health-check-default-http ...@@ -7204,14 +7228,14 @@ backend _health-check-default-http
checkResult(http.client.OK, body_200) checkResult(http.client.OK, body_200)
# start replying with bad status code # start replying with bad status code
result = mimikra.put( result = mimikra.config(
self.backend_url + slave_parameter_dict[ self.backend_url + slave_parameter_dict[
'health-check-http-path'].strip('/'), 'health-check-http-path'].strip('/'),
headers={'X-Reply-Status-Code': '502'}) headers={'X-Reply-Status-Code': '502'})
self.assertEqual(result.status_code, http.client.CREATED) self.assertEqual(result.status_code, http.client.CREATED)
def restoreBackend(): def restoreBackend():
result = mimikra.put( result = mimikra.config(
self.backend_url + slave_parameter_dict[ self.backend_url + slave_parameter_dict[
'health-check-http-path'].strip('/'), 'health-check-http-path'].strip('/'),
headers={}) headers={})
...@@ -7274,7 +7298,7 @@ backend _health-check-default-http ...@@ -7274,7 +7298,7 @@ backend _health-check-default-http
result = fakeHTTPSResult(parameter_dict['domain'], '/path') result = fakeHTTPSResult(parameter_dict['domain'], '/path')
self.assertNotIn('X-Backend-Identification', result.headers) self.assertNotIn('X-Backend-Identification', result.headers)
# start replying with bad status code # start replying with bad status code
result = mimikra.put( result = mimikra.config(
self.backend_url + slave_parameter_dict[ self.backend_url + slave_parameter_dict[
'health-check-http-path'].strip('/'), 'health-check-http-path'].strip('/'),
headers={'X-Reply-Status-Code': '502'}) headers={'X-Reply-Status-Code': '502'})
...@@ -7282,7 +7306,7 @@ backend _health-check-default-http ...@@ -7282,7 +7306,7 @@ backend _health-check-default-http
self.assertEqual(result.status_code, http.client.CREATED) self.assertEqual(result.status_code, http.client.CREATED)
def restoreBackend(): def restoreBackend():
result = mimikra.put( result = mimikra.config(
self.backend_url + slave_parameter_dict[ self.backend_url + slave_parameter_dict[
'health-check-http-path'].strip('/'), 'health-check-http-path'].strip('/'),
headers={}) headers={})
...@@ -7321,7 +7345,7 @@ backend _health-check-default-http ...@@ -7321,7 +7345,7 @@ backend _health-check-default-http
self.assertNotIn('X-Backend-Identification', result.headers) self.assertNotIn('X-Backend-Identification', result.headers)
# start replying with bad status code # start replying with bad status code
result = mimikra.put( result = mimikra.config(
self.backend_url + slave_parameter_dict[ self.backend_url + slave_parameter_dict[
'health-check-http-path'].strip('/'), 'health-check-http-path'].strip('/'),
headers={'X-Reply-Status-Code': '502'}) headers={'X-Reply-Status-Code': '502'})
...@@ -7354,7 +7378,7 @@ backend _health-check-default-http ...@@ -7354,7 +7378,7 @@ backend _health-check-default-http
self.assertEqualResultJson(result, 'Path', '/path') self.assertEqualResultJson(result, 'Path', '/path')
# start replying with bad status code # start replying with bad status code
result = mimikra.put( result = mimikra.config(
self.backend_url + slave_parameter_dict[ self.backend_url + slave_parameter_dict[
'health-check-http-path'].strip('/'), 'health-check-http-path'].strip('/'),
headers={'X-Reply-Status-Code': '502'}) headers={'X-Reply-Status-Code': '502'})
...@@ -7383,7 +7407,7 @@ backend _health-check-default-http ...@@ -7383,7 +7407,7 @@ backend _health-check-default-http
self.assertEqualResultJson(result, 'Path', '/path') self.assertEqualResultJson(result, 'Path', '/path')
# start replying with bad status code # start replying with bad status code
result = mimikra.put( result = mimikra.config(
self.backend_url + slave_parameter_dict[ self.backend_url + slave_parameter_dict[
'health-check-http-path'].strip('/'), 'health-check-http-path'].strip('/'),
headers={'X-Reply-Status-Code': '502'}) headers={'X-Reply-Status-Code': '502'})
...@@ -7413,7 +7437,7 @@ backend _health-check-default-http ...@@ -7413,7 +7437,7 @@ backend _health-check-default-http
self.assertEqualResultJson(result, 'Path', '/path') self.assertEqualResultJson(result, 'Path', '/path')
# start replying with bad status code # start replying with bad status code
result = mimikra.put( result = mimikra.config(
self.backend_url + slave_parameter_dict[ self.backend_url + slave_parameter_dict[
'health-check-http-path'].strip('/'), 'health-check-http-path'].strip('/'),
headers={'X-Reply-Status-Code': '502'}) headers={'X-Reply-Status-Code': '502'})
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7