Skip to content

slapos
slapos
Commit 10781d84 authored by Jérome Perrin's avatar Jérome Perrin
Browse files
Options

Reconcile "test/utils.py" implementations 

Before we move this code to a more suitable place, start by agreeing with small differences in the implementation.

This takes all the nice changes from caddy-frontend/tests/ but not what was specific to caddy or to testing slave instances.

/reviewed-on nexedi/slapos!389
parents 880dcfdf 64096110
Hide whitespace changes
Inline Side-by-side
Showing with 671 additions and 326 deletions
software/caddy-frontend/test/test.py
View file @ 10781d84
...@@ -43,11 +43,15 @@ import subprocess ...@@ -43,11 +43,15 @@ import subprocess
from unittest import skipIf, skip from unittest import skipIf, skip
import ssl import ssl
from BaseHTTPServer import HTTPServer from BaseHTTPServer import HTTPServer
from BaseHTTPServer import BaseHTTPRequestHandler
from forcediphttpsadapter.adapters import ForcedIPHTTPSAdapter from forcediphttpsadapter.adapters import ForcedIPHTTPSAdapter
import time import time
import utils from utils import SlapOSInstanceTestCase
from utils import findFreeTCPPort
LOCAL_IPV4 = os.environ['LOCAL_IPV4']
GLOBAL_IPV6 = os.environ['GLOBAL_IPV6']
# ports chosen to not collide with test systems # ports chosen to not collide with test systems
HTTP_PORT = '11080' HTTP_PORT = '11080'
...@@ -176,12 +180,20 @@ if os.environ.get('DEBUG'): ...@@ -176,12 +180,20 @@ if os.environ.get('DEBUG'):
import unittest import unittest
unittest.installHandler() unittest.installHandler()
def der2pem(der):
certificate, error = subprocess.Popen(
'openssl x509 -inform der'.split(), stdin=subprocess.PIPE,
stdout=subprocess.PIPE, stderr=subprocess.PIPE
).communicate(der)
if error:
raise ValueError(error)
return certificate
def isHTTP2(domain, ip): def isHTTP2(domain, ip):
curl_command = '%(curl)s --http2 -v -k -H "Host: %(domain)s" ' \ curl_command = 'curl --http2 -v -k -H "Host: %(domain)s" ' \
'https://%(domain)s:%(https_port)s/ '\ 'https://%(domain)s:%(https_port)s/ '\
'--resolve %(domain)s:%(https_port)s:%(ip)s' % dict( '--resolve %(domain)s:%(https_port)s:%(ip)s' % dict(
ip=ip, domain=domain, curl=os.environ['CURL'], https_port=HTTPS_PORT) ip=ip, domain=domain, https_port=HTTPS_PORT)
prc = subprocess.Popen( prc = subprocess.Popen(
curl_command.split(), stdout=subprocess.PIPE, stderr=subprocess.PIPE curl_command.split(), stdout=subprocess.PIPE, stderr=subprocess.PIPE
) )
...@@ -275,9 +287,27 @@ class TestDataMixin(object): ...@@ -275,9 +287,27 @@ class TestDataMixin(object):
self.assertTestData(runtime_data) self.assertTestData(runtime_data)
class HttpFrontendTestCase(utils.SlapOSInstanceTestCase): class HttpFrontendTestCase(SlapOSInstanceTestCase):
frontend_type = 'CADDY' if IS_CADDY else 'APACHE' frontend_type = 'CADDY' if IS_CADDY else 'APACHE'
@classmethod
def getSoftwareURLList(cls):
return [os.path.realpath(os.environ['TEST_SR'])]
@classmethod
def setUpClass(cls):
super(HttpFrontendTestCase, cls).setUpClass()
# extra class attributes used in HttpFrontendTestCase
# expose instance directory
cls.instance_path = os.path.join(
cls.config['working_directory'],
'inst')
# expose software directory, extract from found computer partition
cls.software_path = os.path.realpath(os.path.join(
cls.computer_partition_root_path, 'software_release'))
def assertLogAccessUrlWithPop(self, parameter_dict, reference): def assertLogAccessUrlWithPop(self, parameter_dict, reference):
log_access_url = parameter_dict.pop('log-access-url') log_access_url = parameter_dict.pop('log-access-url')
try: try:
...@@ -373,16 +403,30 @@ class TestMasterRequestDomain(HttpFrontendTestCase, TestDataMixin): ...@@ -373,16 +403,30 @@ class TestMasterRequestDomain(HttpFrontendTestCase, TestDataMixin):
) )
class TestHandler(BaseHTTPRequestHandler):
def do_GET(self):
self.send_response(200)
self.send_header("Content-type", "application/json")
self.send_header('Set-Cookie', 'secured=value;secure')
self.send_header('Set-Cookie', 'nonsecured=value')
self.end_headers()
response = {
'Path': self.path,
'Incoming Headers': self.headers.dict
}
self.wfile.write(json.dumps(response, indent=2))
class SlaveHttpFrontendTestCase(HttpFrontendTestCase): class SlaveHttpFrontendTestCase(HttpFrontendTestCase):
@classmethod @classmethod
def startServerProcess(cls): def startServerProcess(cls):
server = HTTPServer( server = HTTPServer(
(utils.LOCAL_IPV4, utils.findFreeTCPPort(utils.LOCAL_IPV4)), (LOCAL_IPV4, findFreeTCPPort(LOCAL_IPV4)),
utils.TestHandler) TestHandler)
server_https = HTTPServer( server_https = HTTPServer(
(utils.LOCAL_IPV4, utils.findFreeTCPPort(utils.LOCAL_IPV4)), (LOCAL_IPV4, findFreeTCPPort(LOCAL_IPV4)),
utils.TestHandler) TestHandler)
server_https.socket = ssl.wrap_socket( server_https.socket = ssl.wrap_socket(
server_https.socket, server_https.socket,
...@@ -526,7 +570,7 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin): ...@@ -526,7 +570,7 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin):
return { return {
'domain': 'example.com', 'domain': 'example.com',
'nginx-domain': 'nginx.example.com', 'nginx-domain': 'nginx.example.com',
'public-ipv4': utils.LOCAL_IPV4, 'public-ipv4': LOCAL_IPV4,
'apache-certificate': open('wildcard.example.com.crt').read(), 'apache-certificate': open('wildcard.example.com.crt').read(),
'apache-key': open('wildcard.example.com.key').read(), 'apache-key': open('wildcard.example.com.key').read(),
'-frontend-authorized-slave-string': '-frontend-authorized-slave-string':
...@@ -797,7 +841,7 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin): ...@@ -797,7 +841,7 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin):
'url': 'http://empty.example.com', 'url': 'http://empty.example.com',
'site_url': 'http://empty.example.com', 'site_url': 'http://empty.example.com',
'secure_access': 'https://empty.example.com', 'secure_access': 'https://empty.example.com',
'public-ipv4': utils.LOCAL_IPV4, 'public-ipv4': LOCAL_IPV4,
} }
) )
...@@ -805,7 +849,7 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin): ...@@ -805,7 +849,7 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin):
parameter_dict['domain'], parameter_dict['public-ipv4'], 'test-path') parameter_dict['domain'], parameter_dict['public-ipv4'], 'test-path')
self.assertEqual( self.assertEqual(
utils.der2pem(result.peercert), der2pem(result.peercert),
open('wildcard.example.com.crt').read()) open('wildcard.example.com.crt').read())
self.assertEqual(result.status_code, no_backend_response_code) self.assertEqual(result.status_code, no_backend_response_code)
...@@ -854,7 +898,7 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin): ...@@ -854,7 +898,7 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin):
'url': 'http://url.example.com', 'url': 'http://url.example.com',
'site_url': 'http://url.example.com', 'site_url': 'http://url.example.com',
'secure_access': 'https://url.example.com', 'secure_access': 'https://url.example.com',
'public-ipv4': utils.LOCAL_IPV4, 'public-ipv4': LOCAL_IPV4,
} }
) )
...@@ -862,7 +906,7 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin): ...@@ -862,7 +906,7 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin):
parameter_dict['domain'], parameter_dict['public-ipv4'], 'test-path') parameter_dict['domain'], parameter_dict['public-ipv4'], 'test-path')
self.assertEqual( self.assertEqual(
utils.der2pem(result.peercert), der2pem(result.peercert),
open('wildcard.example.com.crt').read()) open('wildcard.example.com.crt').read())
self.assertEqualResultJson(result, 'Path', '/test-path') self.assertEqualResultJson(result, 'Path', '/test-path')
...@@ -916,21 +960,21 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin): ...@@ -916,21 +960,21 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin):
'url': 'http://url.example.com', 'url': 'http://url.example.com',
'site_url': 'http://url.example.com', 'site_url': 'http://url.example.com',
'secure_access': 'https://url.example.com', 'secure_access': 'https://url.example.com',
'public-ipv4': utils.LOCAL_IPV4, 'public-ipv4': LOCAL_IPV4,
} }
) )
result_ipv6 = self.fakeHTTPSResult( result_ipv6 = self.fakeHTTPSResult(
parameter_dict['domain'], utils.GLOBAL_IPV6, 'test-path', parameter_dict['domain'], GLOBAL_IPV6, 'test-path',
source_ip=utils.GLOBAL_IPV6) source_ip=GLOBAL_IPV6)
self.assertEqual( self.assertEqual(
result_ipv6.json()['Incoming Headers']['x-forwarded-for'], result_ipv6.json()['Incoming Headers']['x-forwarded-for'],
utils.GLOBAL_IPV6 GLOBAL_IPV6
) )
self.assertEqual( self.assertEqual(
utils.der2pem(result_ipv6.peercert), der2pem(result_ipv6.peercert),
open('wildcard.example.com.crt').read()) open('wildcard.example.com.crt').read())
self.assertEqualResultJson(result_ipv6, 'Path', '/test-path') self.assertEqualResultJson(result_ipv6, 'Path', '/test-path')
...@@ -947,7 +991,7 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin): ...@@ -947,7 +991,7 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin):
'url': 'http://typezopepath.example.com', 'url': 'http://typezopepath.example.com',
'site_url': 'http://typezopepath.example.com', 'site_url': 'http://typezopepath.example.com',
'secure_access': 'https://typezopepath.example.com', 'secure_access': 'https://typezopepath.example.com',
'public-ipv4': utils.LOCAL_IPV4, 'public-ipv4': LOCAL_IPV4,
} }
) )
...@@ -955,7 +999,7 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin): ...@@ -955,7 +999,7 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin):
parameter_dict['domain'], parameter_dict['public-ipv4'], 'test-path') parameter_dict['domain'], parameter_dict['public-ipv4'], 'test-path')
self.assertEqual( self.assertEqual(
utils.der2pem(result.peercert), der2pem(result.peercert),
open('wildcard.example.com.crt').read()) open('wildcard.example.com.crt').read())
self.assertEqualResultJson( self.assertEqualResultJson(
...@@ -977,7 +1021,7 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin): ...@@ -977,7 +1021,7 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin):
'url': 'http://typezopedefaultpath.example.com', 'url': 'http://typezopedefaultpath.example.com',
'site_url': 'http://typezopedefaultpath.example.com', 'site_url': 'http://typezopedefaultpath.example.com',
'secure_access': 'https://typezopedefaultpath.example.com', 'secure_access': 'https://typezopedefaultpath.example.com',
'public-ipv4': utils.LOCAL_IPV4, 'public-ipv4': LOCAL_IPV4,
} }
) )
...@@ -985,7 +1029,7 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin): ...@@ -985,7 +1029,7 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin):
parameter_dict['domain'], parameter_dict['public-ipv4'], '') parameter_dict['domain'], parameter_dict['public-ipv4'], '')
self.assertEqual( self.assertEqual(
utils.der2pem(result.peercert), der2pem(result.peercert),
open('wildcard.example.com.crt').read()) open('wildcard.example.com.crt').read())
self.assertEqual( self.assertEqual(
...@@ -1005,7 +1049,7 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin): ...@@ -1005,7 +1049,7 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin):
'url': 'http://serveralias.example.com', 'url': 'http://serveralias.example.com',
'site_url': 'http://serveralias.example.com', 'site_url': 'http://serveralias.example.com',
'secure_access': 'https://serveralias.example.com', 'secure_access': 'https://serveralias.example.com',
'public-ipv4': utils.LOCAL_IPV4, 'public-ipv4': LOCAL_IPV4,
} }
) )
...@@ -1013,7 +1057,7 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin): ...@@ -1013,7 +1057,7 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin):
parameter_dict['domain'], parameter_dict['public-ipv4'], 'test-path') parameter_dict['domain'], parameter_dict['public-ipv4'], 'test-path')
self.assertEqual( self.assertEqual(
utils.der2pem(result.peercert), der2pem(result.peercert),
open('wildcard.example.com.crt').read()) open('wildcard.example.com.crt').read())
self.assertEqualResultJson(result, 'Path', '/test-path') self.assertEqualResultJson(result, 'Path', '/test-path')
...@@ -1022,7 +1066,7 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin): ...@@ -1022,7 +1066,7 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin):
'alias1.example.com', parameter_dict['public-ipv4'], 'test-path') 'alias1.example.com', parameter_dict['public-ipv4'], 'test-path')
self.assertEqual( self.assertEqual(
utils.der2pem(result.peercert), der2pem(result.peercert),
open('wildcard.example.com.crt').read()) open('wildcard.example.com.crt').read())
self.assertEqualResultJson(result, 'Path', '/test-path') self.assertEqualResultJson(result, 'Path', '/test-path')
...@@ -1031,7 +1075,7 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin): ...@@ -1031,7 +1075,7 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin):
'alias2.example.com', parameter_dict['public-ipv4'], 'test-path') 'alias2.example.com', parameter_dict['public-ipv4'], 'test-path')
self.assertEqual( self.assertEqual(
utils.der2pem(result.peercert), der2pem(result.peercert),
open('wildcard.example.com.crt').read()) open('wildcard.example.com.crt').read())
self.assertEqualResultJson(result, 'Path', '/test-path') self.assertEqualResultJson(result, 'Path', '/test-path')
...@@ -1061,7 +1105,7 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin): ...@@ -1061,7 +1105,7 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin):
'url': 'http://httpsonly.example.com', 'url': 'http://httpsonly.example.com',
'site_url': 'http://httpsonly.example.com', 'site_url': 'http://httpsonly.example.com',
'secure_access': 'https://httpsonly.example.com', 'secure_access': 'https://httpsonly.example.com',
'public-ipv4': utils.LOCAL_IPV4, 'public-ipv4': LOCAL_IPV4,
} }
) )
...@@ -1069,7 +1113,7 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin): ...@@ -1069,7 +1113,7 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin):
parameter_dict['domain'], parameter_dict['public-ipv4'], 'test-path') parameter_dict['domain'], parameter_dict['public-ipv4'], 'test-path')
self.assertEqual( self.assertEqual(
utils.der2pem(result.peercert), der2pem(result.peercert),
open('wildcard.example.com.crt').read()) open('wildcard.example.com.crt').read())
self.assertEqualResultJson(result, 'Path', '/test-path') self.assertEqualResultJson(result, 'Path', '/test-path')
...@@ -1094,7 +1138,7 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin): ...@@ -1094,7 +1138,7 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin):
'url': 'http://customdomain.example.com', 'url': 'http://customdomain.example.com',
'site_url': 'http://customdomain.example.com', 'site_url': 'http://customdomain.example.com',
'secure_access': 'https://customdomain.example.com', 'secure_access': 'https://customdomain.example.com',
'public-ipv4': utils.LOCAL_IPV4, 'public-ipv4': LOCAL_IPV4,
} }
) )
...@@ -1102,7 +1146,7 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin): ...@@ -1102,7 +1146,7 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin):
parameter_dict['domain'], parameter_dict['public-ipv4'], 'test-path') parameter_dict['domain'], parameter_dict['public-ipv4'], 'test-path')
self.assertEqual( self.assertEqual(
utils.der2pem(result.peercert), der2pem(result.peercert),
open('wildcard.example.com.crt').read()) open('wildcard.example.com.crt').read())
self.assertEqualResultJson(result, 'Path', '/test-path') self.assertEqualResultJson(result, 'Path', '/test-path')
...@@ -1119,7 +1163,7 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin): ...@@ -1119,7 +1163,7 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin):
'url': 'http://customdomainsslcrtsslkey.example.com', 'url': 'http://customdomainsslcrtsslkey.example.com',
'site_url': 'http://customdomainsslcrtsslkey.example.com', 'site_url': 'http://customdomainsslcrtsslkey.example.com',
'secure_access': 'https://customdomainsslcrtsslkey.example.com', 'secure_access': 'https://customdomainsslcrtsslkey.example.com',
'public-ipv4': utils.LOCAL_IPV4, 'public-ipv4': LOCAL_IPV4,
} }
) )
...@@ -1127,7 +1171,7 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin): ...@@ -1127,7 +1171,7 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin):
parameter_dict['domain'], parameter_dict['public-ipv4'], 'test-path') parameter_dict['domain'], parameter_dict['public-ipv4'], 'test-path')
self.assertEqual( self.assertEqual(
utils.der2pem(result.peercert), der2pem(result.peercert),
open('customdomainsslcrtsslkey.example.com.crt').read()) open('customdomainsslcrtsslkey.example.com.crt').read())
self.assertEqualResultJson(result, 'Path', '/test-path') self.assertEqualResultJson(result, 'Path', '/test-path')
...@@ -1144,7 +1188,7 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin): ...@@ -1144,7 +1188,7 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin):
'url': 'http://typezope.example.com', 'url': 'http://typezope.example.com',
'site_url': 'http://typezope.example.com', 'site_url': 'http://typezope.example.com',
'secure_access': 'https://typezope.example.com', 'secure_access': 'https://typezope.example.com',
'public-ipv4': utils.LOCAL_IPV4, 'public-ipv4': LOCAL_IPV4,
} }
) )
...@@ -1152,7 +1196,7 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin): ...@@ -1152,7 +1196,7 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin):
parameter_dict['domain'], parameter_dict['public-ipv4'], 'test-path') parameter_dict['domain'], parameter_dict['public-ipv4'], 'test-path')
self.assertEqual( self.assertEqual(
utils.der2pem(result.peercert), der2pem(result.peercert),
open('wildcard.example.com.crt').read()) open('wildcard.example.com.crt').read())
try: try:
...@@ -1192,7 +1236,7 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin): ...@@ -1192,7 +1236,7 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin):
'site_url': 'http://typezopevirtualhostroothttpport.example.com', 'site_url': 'http://typezopevirtualhostroothttpport.example.com',
'secure_access': 'secure_access':
'https://typezopevirtualhostroothttpport.example.com', 'https://typezopevirtualhostroothttpport.example.com',
'public-ipv4': utils.LOCAL_IPV4, 'public-ipv4': LOCAL_IPV4,
} }
) )
...@@ -1220,7 +1264,7 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin): ...@@ -1220,7 +1264,7 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin):
'site_url': 'http://typezopevirtualhostroothttpsport.example.com', 'site_url': 'http://typezopevirtualhostroothttpsport.example.com',
'secure_access': 'secure_access':
'https://typezopevirtualhostroothttpsport.example.com', 'https://typezopevirtualhostroothttpsport.example.com',
'public-ipv4': utils.LOCAL_IPV4, 'public-ipv4': LOCAL_IPV4,
} }
) )
...@@ -1228,7 +1272,7 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin): ...@@ -1228,7 +1272,7 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin):
parameter_dict['domain'], parameter_dict['public-ipv4'], 'test-path') parameter_dict['domain'], parameter_dict['public-ipv4'], 'test-path')
self.assertEqual( self.assertEqual(
utils.der2pem(result.peercert), der2pem(result.peercert),
open('wildcard.example.com.crt').read()) open('wildcard.example.com.crt').read())
self.assertEqualResultJson( self.assertEqualResultJson(
...@@ -1250,7 +1294,7 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin): ...@@ -1250,7 +1294,7 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin):
'url': 'http://typenotebook.nginx.example.com', 'url': 'http://typenotebook.nginx.example.com',
'site_url': 'http://typenotebook.nginx.example.com', 'site_url': 'http://typenotebook.nginx.example.com',
'secure_access': 'https://typenotebook.nginx.example.com', 'secure_access': 'https://typenotebook.nginx.example.com',
'public-ipv4': utils.LOCAL_IPV4, 'public-ipv4': LOCAL_IPV4,
} }
) )
...@@ -1259,7 +1303,7 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin): ...@@ -1259,7 +1303,7 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin):
NGINX_HTTPS_PORT) NGINX_HTTPS_PORT)
self.assertEqual( self.assertEqual(
utils.der2pem(result.peercert), der2pem(result.peercert),
open('wildcard.example.com.crt').read()) open('wildcard.example.com.crt').read())
self.assertEqualResultJson(result, 'Path', '/test-path') self.assertEqualResultJson(result, 'Path', '/test-path')
...@@ -1292,7 +1336,7 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin): ...@@ -1292,7 +1336,7 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin):
'url': 'http://typeeventsource.nginx.example.com', 'url': 'http://typeeventsource.nginx.example.com',
'site_url': 'http://typeeventsource.nginx.example.com', 'site_url': 'http://typeeventsource.nginx.example.com',
'secure_access': 'https://typeeventsource.nginx.example.com', 'secure_access': 'https://typeeventsource.nginx.example.com',
'public-ipv4': utils.LOCAL_IPV4, 'public-ipv4': LOCAL_IPV4,
} }
) )
...@@ -1301,7 +1345,7 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin): ...@@ -1301,7 +1345,7 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin):
NGINX_HTTPS_PORT) NGINX_HTTPS_PORT)
self.assertEqual( self.assertEqual(
utils.der2pem(result.peercert), der2pem(result.peercert),
open('wildcard.example.com.crt').read()) open('wildcard.example.com.crt').read())
self.assertEqual( self.assertEqual(
...@@ -1334,7 +1378,7 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin): ...@@ -1334,7 +1378,7 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin):
'url': 'http://typeredirect.example.com', 'url': 'http://typeredirect.example.com',
'site_url': 'http://typeredirect.example.com', 'site_url': 'http://typeredirect.example.com',
'secure_access': 'https://typeredirect.example.com', 'secure_access': 'https://typeredirect.example.com',
'public-ipv4': utils.LOCAL_IPV4, 'public-ipv4': LOCAL_IPV4,
} }
) )
...@@ -1342,7 +1386,7 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin): ...@@ -1342,7 +1386,7 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin):
parameter_dict['domain'], parameter_dict['public-ipv4'], 'test-path') parameter_dict['domain'], parameter_dict['public-ipv4'], 'test-path')
self.assertEqual( self.assertEqual(
utils.der2pem(result.peercert), der2pem(result.peercert),
open('wildcard.example.com.crt').read()) open('wildcard.example.com.crt').read())
self.assertEqual( self.assertEqual(
...@@ -1364,7 +1408,7 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin): ...@@ -1364,7 +1408,7 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin):
'url': 'http://sslproxyverifysslproxycacrt.example.com', 'url': 'http://sslproxyverifysslproxycacrt.example.com',
'site_url': 'http://sslproxyverifysslproxycacrt.example.com', 'site_url': 'http://sslproxyverifysslproxycacrt.example.com',
'secure_access': 'https://sslproxyverifysslproxycacrt.example.com', 'secure_access': 'https://sslproxyverifysslproxycacrt.example.com',
'public-ipv4': utils.LOCAL_IPV4, 'public-ipv4': LOCAL_IPV4,
} }
) )
...@@ -1372,7 +1416,7 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin): ...@@ -1372,7 +1416,7 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin):
parameter_dict['domain'], parameter_dict['public-ipv4'], 'test-path') parameter_dict['domain'], parameter_dict['public-ipv4'], 'test-path')
self.assertEqual( self.assertEqual(
utils.der2pem(result.peercert), der2pem(result.peercert),
open('wildcard.example.com.crt').read()) open('wildcard.example.com.crt').read())
if IS_CADDY: if IS_CADDY:
...@@ -1441,7 +1485,7 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin): ...@@ -1441,7 +1485,7 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin):
'url': 'http://sslproxyverifyunverified.example.com', 'url': 'http://sslproxyverifyunverified.example.com',
'site_url': 'http://sslproxyverifyunverified.example.com', 'site_url': 'http://sslproxyverifyunverified.example.com',
'secure_access': 'https://sslproxyverifyunverified.example.com', 'secure_access': 'https://sslproxyverifyunverified.example.com',
'public-ipv4': utils.LOCAL_IPV4, 'public-ipv4': LOCAL_IPV4,
} }
) )
...@@ -1449,7 +1493,7 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin): ...@@ -1449,7 +1493,7 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin):
parameter_dict['domain'], parameter_dict['public-ipv4'], 'test-path') parameter_dict['domain'], parameter_dict['public-ipv4'], 'test-path')
self.assertEqual( self.assertEqual(
utils.der2pem(result.peercert), der2pem(result.peercert),
open('wildcard.example.com.crt').read()) open('wildcard.example.com.crt').read())
self.assertEqual( self.assertEqual(
...@@ -1473,7 +1517,7 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin): ...@@ -1473,7 +1517,7 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin):
'http://enablecachesslproxyverifysslproxycacrt.example.com', 'http://enablecachesslproxyverifysslproxycacrt.example.com',
'secure_access': 'secure_access':
'https://enablecachesslproxyverifysslproxycacrt.example.com', 'https://enablecachesslproxyverifysslproxycacrt.example.com',
'public-ipv4': utils.LOCAL_IPV4, 'public-ipv4': LOCAL_IPV4,
} }
) )
...@@ -1481,7 +1525,7 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin): ...@@ -1481,7 +1525,7 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin):
parameter_dict['domain'], parameter_dict['public-ipv4'], 'test-path') parameter_dict['domain'], parameter_dict['public-ipv4'], 'test-path')
self.assertEqual( self.assertEqual(
utils.der2pem(result.peercert), der2pem(result.peercert),
open('wildcard.example.com.crt').read()) open('wildcard.example.com.crt').read())
if IS_CADDY: if IS_CADDY:
...@@ -1558,7 +1602,7 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin): ...@@ -1558,7 +1602,7 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin):
'site_url': 'http://enablecachesslproxyverifyunverified.example.com', 'site_url': 'http://enablecachesslproxyverifyunverified.example.com',
'secure_access': 'secure_access':
'https://enablecachesslproxyverifyunverified.example.com', 'https://enablecachesslproxyverifyunverified.example.com',
'public-ipv4': utils.LOCAL_IPV4, 'public-ipv4': LOCAL_IPV4,
} }
) )
...@@ -1566,7 +1610,7 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin): ...@@ -1566,7 +1610,7 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin):
parameter_dict['domain'], parameter_dict['public-ipv4'], 'test-path') parameter_dict['domain'], parameter_dict['public-ipv4'], 'test-path')
self.assertEqual( self.assertEqual(
utils.der2pem(result.peercert), der2pem(result.peercert),
open('wildcard.example.com.crt').read()) open('wildcard.example.com.crt').read())
self.assertEqual( self.assertEqual(
...@@ -1589,7 +1633,7 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin): ...@@ -1589,7 +1633,7 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin):
'site_url': 'http://typezopesslproxyverifysslproxycacrt.example.com', 'site_url': 'http://typezopesslproxyverifysslproxycacrt.example.com',
'secure_access': 'secure_access':
'https://typezopesslproxyverifysslproxycacrt.example.com', 'https://typezopesslproxyverifysslproxycacrt.example.com',
'public-ipv4': utils.LOCAL_IPV4, 'public-ipv4': LOCAL_IPV4,
} }
) )
...@@ -1597,7 +1641,7 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin): ...@@ -1597,7 +1641,7 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin):
parameter_dict['domain'], parameter_dict['public-ipv4'], 'test-path') parameter_dict['domain'], parameter_dict['public-ipv4'], 'test-path')
self.assertEqual( self.assertEqual(
utils.der2pem(result.peercert), der2pem(result.peercert),
open('wildcard.example.com.crt').read()) open('wildcard.example.com.crt').read())
if IS_CADDY: if IS_CADDY:
...@@ -1652,7 +1696,7 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin): ...@@ -1652,7 +1696,7 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin):
'site_url': 'http://typezopesslproxyverifyunverified.example.com', 'site_url': 'http://typezopesslproxyverifyunverified.example.com',
'secure_access': 'secure_access':
'https://typezopesslproxyverifyunverified.example.com', 'https://typezopesslproxyverifyunverified.example.com',
'public-ipv4': utils.LOCAL_IPV4, 'public-ipv4': LOCAL_IPV4,
} }
) )
...@@ -1660,7 +1704,7 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin): ...@@ -1660,7 +1704,7 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin):
parameter_dict['domain'], parameter_dict['public-ipv4'], 'test-path') parameter_dict['domain'], parameter_dict['public-ipv4'], 'test-path')
self.assertEqual( self.assertEqual(
utils.der2pem(result.peercert), der2pem(result.peercert),
open('wildcard.example.com.crt').read()) open('wildcard.example.com.crt').read())
self.assertEqual( self.assertEqual(
...@@ -1680,7 +1724,7 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin): ...@@ -1680,7 +1724,7 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin):
'url': 'http://monitoripv6test.example.com', 'url': 'http://monitoripv6test.example.com',
'site_url': 'http://monitoripv6test.example.com', 'site_url': 'http://monitoripv6test.example.com',
'secure_access': 'https://monitoripv6test.example.com', 'secure_access': 'https://monitoripv6test.example.com',
'public-ipv4': utils.LOCAL_IPV4, 'public-ipv4': LOCAL_IPV4,
} }
) )
...@@ -1688,7 +1732,7 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin): ...@@ -1688,7 +1732,7 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin):
parameter_dict['domain'], parameter_dict['public-ipv4'], 'test-path') parameter_dict['domain'], parameter_dict['public-ipv4'], 'test-path')
self.assertEqual( self.assertEqual(
utils.der2pem(result.peercert), der2pem(result.peercert),
open('wildcard.example.com.crt').read()) open('wildcard.example.com.crt').read())
self.assertEqual(result.status_code, no_backend_response_code) self.assertEqual(result.status_code, no_backend_response_code)
...@@ -1723,7 +1767,7 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin): ...@@ -1723,7 +1767,7 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin):
'url': 'http://monitoripv4test.example.com', 'url': 'http://monitoripv4test.example.com',
'site_url': 'http://monitoripv4test.example.com', 'site_url': 'http://monitoripv4test.example.com',
'secure_access': 'https://monitoripv4test.example.com', 'secure_access': 'https://monitoripv4test.example.com',
'public-ipv4': utils.LOCAL_IPV4, 'public-ipv4': LOCAL_IPV4,
} }
) )
...@@ -1731,7 +1775,7 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin): ...@@ -1731,7 +1775,7 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin):
parameter_dict['domain'], parameter_dict['public-ipv4'], 'test-path') parameter_dict['domain'], parameter_dict['public-ipv4'], 'test-path')
self.assertEqual( self.assertEqual(
utils.der2pem(result.peercert), der2pem(result.peercert),
open('wildcard.example.com.crt').read()) open('wildcard.example.com.crt').read())
self.assertEqual(result.status_code, no_backend_response_code) self.assertEqual(result.status_code, no_backend_response_code)
...@@ -1766,7 +1810,7 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin): ...@@ -1766,7 +1810,7 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin):
'url': 'http://re6stoptimaltest.example.com', 'url': 'http://re6stoptimaltest.example.com',
'site_url': 'http://re6stoptimaltest.example.com', 'site_url': 'http://re6stoptimaltest.example.com',
'secure_access': 'https://re6stoptimaltest.example.com', 'secure_access': 'https://re6stoptimaltest.example.com',
'public-ipv4': utils.LOCAL_IPV4, 'public-ipv4': LOCAL_IPV4,
} }
) )
...@@ -1774,7 +1818,7 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin): ...@@ -1774,7 +1818,7 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin):
parameter_dict['domain'], parameter_dict['public-ipv4'], 'test-path') parameter_dict['domain'], parameter_dict['public-ipv4'], 'test-path')
self.assertEqual( self.assertEqual(
utils.der2pem(result.peercert), der2pem(result.peercert),
open('wildcard.example.com.crt').read()) open('wildcard.example.com.crt').read())
self.assertEqual(result.status_code, no_backend_response_code) self.assertEqual(result.status_code, no_backend_response_code)
...@@ -1810,7 +1854,7 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin): ...@@ -1810,7 +1854,7 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin):
'url': 'http://enablecache.example.com', 'url': 'http://enablecache.example.com',
'site_url': 'http://enablecache.example.com', 'site_url': 'http://enablecache.example.com',
'secure_access': 'https://enablecache.example.com', 'secure_access': 'https://enablecache.example.com',
'public-ipv4': utils.LOCAL_IPV4, 'public-ipv4': LOCAL_IPV4,
} }
) )
...@@ -1818,7 +1862,7 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin): ...@@ -1818,7 +1862,7 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin):
parameter_dict['domain'], parameter_dict['public-ipv4'], 'test-path') parameter_dict['domain'], parameter_dict['public-ipv4'], 'test-path')
self.assertEqual( self.assertEqual(
utils.der2pem(result.peercert), der2pem(result.peercert),
open('wildcard.example.com.crt').read()) open('wildcard.example.com.crt').read())
self.assertEqualResultJson(result, 'Path', '/test-path') self.assertEqualResultJson(result, 'Path', '/test-path')
...@@ -1902,7 +1946,7 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin): ...@@ -1902,7 +1946,7 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin):
'site_url': 'http://enablecachedisablenocacherequest.example.com', 'site_url': 'http://enablecachedisablenocacherequest.example.com',
'secure_access': 'secure_access':
'https://enablecachedisablenocacherequest.example.com', 'https://enablecachedisablenocacherequest.example.com',
'public-ipv4': utils.LOCAL_IPV4, 'public-ipv4': LOCAL_IPV4,
} }
) )
...@@ -1911,7 +1955,7 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin): ...@@ -1911,7 +1955,7 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin):
headers={'Pragma': 'no-cache', 'Cache-Control': 'something'}) headers={'Pragma': 'no-cache', 'Cache-Control': 'something'})
self.assertEqual( self.assertEqual(
utils.der2pem(result.peercert), der2pem(result.peercert),
open('wildcard.example.com.crt').read()) open('wildcard.example.com.crt').read())
self.assertEqualResultJson(result, 'Path', '/test-path') self.assertEqualResultJson(result, 'Path', '/test-path')
...@@ -1955,7 +1999,7 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin): ...@@ -1955,7 +1999,7 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin):
'site_url': 'http://enablecachedisableviaheader.example.com', 'site_url': 'http://enablecachedisableviaheader.example.com',
'secure_access': 'secure_access':
'https://enablecachedisableviaheader.example.com', 'https://enablecachedisableviaheader.example.com',
'public-ipv4': utils.LOCAL_IPV4, 'public-ipv4': LOCAL_IPV4,
} }
) )
...@@ -1963,7 +2007,7 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin): ...@@ -1963,7 +2007,7 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin):
parameter_dict['domain'], parameter_dict['public-ipv4'], 'test-path') parameter_dict['domain'], parameter_dict['public-ipv4'], 'test-path')
self.assertEqual( self.assertEqual(
utils.der2pem(result.peercert), der2pem(result.peercert),
open('wildcard.example.com.crt').read()) open('wildcard.example.com.crt').read())
self.assertEqualResultJson(result, 'Path', '/test-path') self.assertEqualResultJson(result, 'Path', '/test-path')
...@@ -2000,7 +2044,7 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin): ...@@ -2000,7 +2044,7 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin):
'site_url': 'http://enablehttp2false.example.com', 'site_url': 'http://enablehttp2false.example.com',
'secure_access': 'secure_access':
'https://enablehttp2false.example.com', 'https://enablehttp2false.example.com',
'public-ipv4': utils.LOCAL_IPV4, 'public-ipv4': LOCAL_IPV4,
} }
) )
...@@ -2008,7 +2052,7 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin): ...@@ -2008,7 +2052,7 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin):
parameter_dict['domain'], parameter_dict['public-ipv4'], 'test-path') parameter_dict['domain'], parameter_dict['public-ipv4'], 'test-path')
self.assertEqual( self.assertEqual(
utils.der2pem(result.peercert), der2pem(result.peercert),
open('wildcard.example.com.crt').read()) open('wildcard.example.com.crt').read())
self.assertEqualResultJson(result, 'Path', '/test-path') self.assertEqualResultJson(result, 'Path', '/test-path')
...@@ -2050,7 +2094,7 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin): ...@@ -2050,7 +2094,7 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin):
'site_url': 'http://enablehttp2default.example.com', 'site_url': 'http://enablehttp2default.example.com',
'secure_access': 'secure_access':
'https://enablehttp2default.example.com', 'https://enablehttp2default.example.com',
'public-ipv4': utils.LOCAL_IPV4, 'public-ipv4': LOCAL_IPV4,
} }
) )
...@@ -2058,7 +2102,7 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin): ...@@ -2058,7 +2102,7 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin):
parameter_dict['domain'], parameter_dict['public-ipv4'], 'test-path') parameter_dict['domain'], parameter_dict['public-ipv4'], 'test-path')
self.assertEqual( self.assertEqual(
utils.der2pem(result.peercert), der2pem(result.peercert),
open('wildcard.example.com.crt').read()) open('wildcard.example.com.crt').read())
self.assertEqualResultJson(result, 'Path', '/test-path') self.assertEqualResultJson(result, 'Path', '/test-path')
...@@ -2101,7 +2145,7 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin): ...@@ -2101,7 +2145,7 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin):
'site_url': 'http://prefergzipencodingtobackend.example.com', 'site_url': 'http://prefergzipencodingtobackend.example.com',
'secure_access': 'secure_access':
'https://prefergzipencodingtobackend.example.com', 'https://prefergzipencodingtobackend.example.com',
'public-ipv4': utils.LOCAL_IPV4, 'public-ipv4': LOCAL_IPV4,
} }
) )
...@@ -2110,7 +2154,7 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin): ...@@ -2110,7 +2154,7 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin):
headers={'Accept-Encoding': 'gzip, deflate'}) headers={'Accept-Encoding': 'gzip, deflate'})
self.assertEqual( self.assertEqual(
utils.der2pem(result.peercert), der2pem(result.peercert),
open('wildcard.example.com.crt').read()) open('wildcard.example.com.crt').read())
self.assertEqualResultJson(result, 'Path', '/test-path') self.assertEqualResultJson(result, 'Path', '/test-path')
...@@ -2140,7 +2184,7 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin): ...@@ -2140,7 +2184,7 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin):
'url': 'http://disabledcookielist.example.com', 'url': 'http://disabledcookielist.example.com',
'site_url': 'http://disabledcookielist.example.com', 'site_url': 'http://disabledcookielist.example.com',
'secure_access': 'https://disabledcookielist.example.com', 'secure_access': 'https://disabledcookielist.example.com',
'public-ipv4': utils.LOCAL_IPV4, 'public-ipv4': LOCAL_IPV4,
} }
) )
...@@ -2153,7 +2197,7 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin): ...@@ -2153,7 +2197,7 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin):
)) ))
self.assertEqual( self.assertEqual(
utils.der2pem(result.peercert), der2pem(result.peercert),
open('wildcard.example.com.crt').read()) open('wildcard.example.com.crt').read())
self.assertEqualResultJson(result, 'Path', '/test-path') self.assertEqualResultJson(result, 'Path', '/test-path')
...@@ -2185,7 +2229,7 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin): ...@@ -2185,7 +2229,7 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin):
parameter_dict, 'apache_custom_http_s-accepted') parameter_dict, 'apache_custom_http_s-accepted')
self.assertEqual( self.assertEqual(
parameter_dict, parameter_dict,
{'replication_number': '1', 'public-ipv4': utils.LOCAL_IPV4} {'replication_number': '1', 'public-ipv4': LOCAL_IPV4}
) )
result = self.fakeHTTPSResult( result = self.fakeHTTPSResult(
...@@ -2193,7 +2237,7 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin): ...@@ -2193,7 +2237,7 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin):
parameter_dict['public-ipv4'], 'test-path') parameter_dict['public-ipv4'], 'test-path')
self.assertEqual( self.assertEqual(
utils.der2pem(result.peercert), der2pem(result.peercert),
open('wildcard.example.com.crt').read()) open('wildcard.example.com.crt').read())
self.assertEqualResultJson(result, 'Path', '/test-path') self.assertEqualResultJson(result, 'Path', '/test-path')
...@@ -2271,7 +2315,7 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin): ...@@ -2271,7 +2315,7 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin):
parameter_dict, 'caddy_custom_http_s-accepted') parameter_dict, 'caddy_custom_http_s-accepted')
self.assertEqual( self.assertEqual(
parameter_dict, parameter_dict,
{'replication_number': '1', 'public-ipv4': utils.LOCAL_IPV4} {'replication_number': '1', 'public-ipv4': LOCAL_IPV4}
) )
result = self.fakeHTTPSResult( result = self.fakeHTTPSResult(
...@@ -2279,7 +2323,7 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin): ...@@ -2279,7 +2323,7 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin):
parameter_dict['public-ipv4'], 'test-path') parameter_dict['public-ipv4'], 'test-path')
self.assertEqual( self.assertEqual(
utils.der2pem(result.peercert), der2pem(result.peercert),
open('wildcard.example.com.crt').read()) open('wildcard.example.com.crt').read())
self.assertEqualResultJson(result, 'Path', '/test-path') self.assertEqualResultJson(result, 'Path', '/test-path')
...@@ -2333,7 +2377,7 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin): ...@@ -2333,7 +2377,7 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin):
'url': 'http://urlhttpsurl.example.com', 'url': 'http://urlhttpsurl.example.com',
'site_url': 'http://urlhttpsurl.example.com', 'site_url': 'http://urlhttpsurl.example.com',
'secure_access': 'https://urlhttpsurl.example.com', 'secure_access': 'https://urlhttpsurl.example.com',
'public-ipv4': utils.LOCAL_IPV4, 'public-ipv4': LOCAL_IPV4,
} }
) )
...@@ -2341,7 +2385,7 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin): ...@@ -2341,7 +2385,7 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin):
parameter_dict['domain'], parameter_dict['public-ipv4'], 'test-path') parameter_dict['domain'], parameter_dict['public-ipv4'], 'test-path')
self.assertEqual( self.assertEqual(
utils.der2pem(result.peercert), der2pem(result.peercert),
open('wildcard.example.com.crt').read()) open('wildcard.example.com.crt').read())
self.assertEqualResultJson(result, 'Path', '/https/test-path') self.assertEqualResultJson(result, 'Path', '/https/test-path')
...@@ -2357,7 +2401,7 @@ class TestReplicateSlave(SlaveHttpFrontendTestCase, TestDataMixin): ...@@ -2357,7 +2401,7 @@ class TestReplicateSlave(SlaveHttpFrontendTestCase, TestDataMixin):
return { return {
'domain': 'example.com', 'domain': 'example.com',
'nginx-domain': 'nginx.example.com', 'nginx-domain': 'nginx.example.com',
'public-ipv4': utils.LOCAL_IPV4, 'public-ipv4': LOCAL_IPV4,
'apache-certificate': open('wildcard.example.com.crt').read(), 'apache-certificate': open('wildcard.example.com.crt').read(),
'apache-key': open('wildcard.example.com.key').read(), 'apache-key': open('wildcard.example.com.key').read(),
'-frontend-quantity': 2, '-frontend-quantity': 2,
...@@ -2392,7 +2436,7 @@ class TestReplicateSlave(SlaveHttpFrontendTestCase, TestDataMixin): ...@@ -2392,7 +2436,7 @@ class TestReplicateSlave(SlaveHttpFrontendTestCase, TestDataMixin):
'url': 'http://replicate.example.com', 'url': 'http://replicate.example.com',
'site_url': 'http://replicate.example.com', 'site_url': 'http://replicate.example.com',
'secure_access': 'https://replicate.example.com', 'secure_access': 'https://replicate.example.com',
'public-ipv4': utils.LOCAL_IPV4, 'public-ipv4': LOCAL_IPV4,
} }
) )
...@@ -2400,7 +2444,7 @@ class TestReplicateSlave(SlaveHttpFrontendTestCase, TestDataMixin): ...@@ -2400,7 +2444,7 @@ class TestReplicateSlave(SlaveHttpFrontendTestCase, TestDataMixin):
parameter_dict['domain'], parameter_dict['public-ipv4'], 'test-path') parameter_dict['domain'], parameter_dict['public-ipv4'], 'test-path')
self.assertEqual( self.assertEqual(
utils.der2pem(result.peercert), der2pem(result.peercert),
open('wildcard.example.com.crt').read()) open('wildcard.example.com.crt').read())
self.assertEqualResultJson(result, 'Path', '/test-path') self.assertEqualResultJson(result, 'Path', '/test-path')
...@@ -2430,7 +2474,7 @@ class TestEnableHttp2ByDefaultFalseSlave(SlaveHttpFrontendTestCase, ...@@ -2430,7 +2474,7 @@ class TestEnableHttp2ByDefaultFalseSlave(SlaveHttpFrontendTestCase,
return { return {
'domain': 'example.com', 'domain': 'example.com',
'nginx-domain': 'nginx.example.com', 'nginx-domain': 'nginx.example.com',
'public-ipv4': utils.LOCAL_IPV4, 'public-ipv4': LOCAL_IPV4,
'apache-certificate': open('wildcard.example.com.crt').read(), 'apache-certificate': open('wildcard.example.com.crt').read(),
'apache-key': open('wildcard.example.com.key').read(), 'apache-key': open('wildcard.example.com.key').read(),
'enable-http2-by-default': 'false', 'enable-http2-by-default': 'false',
...@@ -2468,7 +2512,7 @@ class TestEnableHttp2ByDefaultFalseSlave(SlaveHttpFrontendTestCase, ...@@ -2468,7 +2512,7 @@ class TestEnableHttp2ByDefaultFalseSlave(SlaveHttpFrontendTestCase,
'site_url': 'http://enablehttp2default.example.com', 'site_url': 'http://enablehttp2default.example.com',
'secure_access': 'secure_access':
'https://enablehttp2default.example.com', 'https://enablehttp2default.example.com',
'public-ipv4': utils.LOCAL_IPV4, 'public-ipv4': LOCAL_IPV4,
} }
) )
...@@ -2488,7 +2532,7 @@ class TestEnableHttp2ByDefaultFalseSlave(SlaveHttpFrontendTestCase, ...@@ -2488,7 +2532,7 @@ class TestEnableHttp2ByDefaultFalseSlave(SlaveHttpFrontendTestCase,
'site_url': 'http://enablehttp2false.example.com', 'site_url': 'http://enablehttp2false.example.com',
'secure_access': 'secure_access':
'https://enablehttp2false.example.com', 'https://enablehttp2false.example.com',
'public-ipv4': utils.LOCAL_IPV4, 'public-ipv4': LOCAL_IPV4,
} }
) )
...@@ -2508,7 +2552,7 @@ class TestEnableHttp2ByDefaultFalseSlave(SlaveHttpFrontendTestCase, ...@@ -2508,7 +2552,7 @@ class TestEnableHttp2ByDefaultFalseSlave(SlaveHttpFrontendTestCase,
'site_url': 'http://enablehttp2true.example.com', 'site_url': 'http://enablehttp2true.example.com',
'secure_access': 'secure_access':
'https://enablehttp2true.example.com', 'https://enablehttp2true.example.com',
'public-ipv4': utils.LOCAL_IPV4, 'public-ipv4': LOCAL_IPV4,
} }
) )
...@@ -2524,7 +2568,7 @@ class TestEnableHttp2ByDefaultDefaultSlave(SlaveHttpFrontendTestCase, ...@@ -2524,7 +2568,7 @@ class TestEnableHttp2ByDefaultDefaultSlave(SlaveHttpFrontendTestCase,
return { return {
'domain': 'example.com', 'domain': 'example.com',
'nginx-domain': 'nginx.example.com', 'nginx-domain': 'nginx.example.com',
'public-ipv4': utils.LOCAL_IPV4, 'public-ipv4': LOCAL_IPV4,
'apache-certificate': open('wildcard.example.com.crt').read(), 'apache-certificate': open('wildcard.example.com.crt').read(),
'apache-key': open('wildcard.example.com.key').read(), 'apache-key': open('wildcard.example.com.key').read(),
'port': HTTPS_PORT, 'port': HTTPS_PORT,
...@@ -2561,7 +2605,7 @@ class TestEnableHttp2ByDefaultDefaultSlave(SlaveHttpFrontendTestCase, ...@@ -2561,7 +2605,7 @@ class TestEnableHttp2ByDefaultDefaultSlave(SlaveHttpFrontendTestCase,
'site_url': 'http://enablehttp2default.example.com', 'site_url': 'http://enablehttp2default.example.com',
'secure_access': 'secure_access':
'https://enablehttp2default.example.com', 'https://enablehttp2default.example.com',
'public-ipv4': utils.LOCAL_IPV4, 'public-ipv4': LOCAL_IPV4,
} }
) )
...@@ -2581,7 +2625,7 @@ class TestEnableHttp2ByDefaultDefaultSlave(SlaveHttpFrontendTestCase, ...@@ -2581,7 +2625,7 @@ class TestEnableHttp2ByDefaultDefaultSlave(SlaveHttpFrontendTestCase,
'site_url': 'http://enablehttp2false.example.com', 'site_url': 'http://enablehttp2false.example.com',
'secure_access': 'secure_access':
'https://enablehttp2false.example.com', 'https://enablehttp2false.example.com',
'public-ipv4': utils.LOCAL_IPV4, 'public-ipv4': LOCAL_IPV4,
} }
) )
...@@ -2601,7 +2645,7 @@ class TestEnableHttp2ByDefaultDefaultSlave(SlaveHttpFrontendTestCase, ...@@ -2601,7 +2645,7 @@ class TestEnableHttp2ByDefaultDefaultSlave(SlaveHttpFrontendTestCase,
'site_url': 'http://enablehttp2true.example.com', 'site_url': 'http://enablehttp2true.example.com',
'secure_access': 'secure_access':
'https://enablehttp2true.example.com', 'https://enablehttp2true.example.com',
'public-ipv4': utils.LOCAL_IPV4, 'public-ipv4': LOCAL_IPV4,
} }
) )
...@@ -2715,7 +2759,7 @@ class TestMalformedBackenUrlSlave(SlaveHttpFrontendTestCase, ...@@ -2715,7 +2759,7 @@ class TestMalformedBackenUrlSlave(SlaveHttpFrontendTestCase,
return { return {
'domain': 'example.com', 'domain': 'example.com',
'nginx-domain': 'nginx.example.com', 'nginx-domain': 'nginx.example.com',
'public-ipv4': utils.LOCAL_IPV4, 'public-ipv4': LOCAL_IPV4,
'apache-certificate': open('wildcard.example.com.crt').read(), 'apache-certificate': open('wildcard.example.com.crt').read(),
'apache-key': open('wildcard.example.com.key').read(), 'apache-key': open('wildcard.example.com.key').read(),
'port': HTTPS_PORT, 'port': HTTPS_PORT,
...@@ -2768,7 +2812,7 @@ class TestMalformedBackenUrlSlave(SlaveHttpFrontendTestCase, ...@@ -2768,7 +2812,7 @@ class TestMalformedBackenUrlSlave(SlaveHttpFrontendTestCase,
'url': 'http://empty.example.com', 'url': 'http://empty.example.com',
'site_url': 'http://empty.example.com', 'site_url': 'http://empty.example.com',
'secure_access': 'https://empty.example.com', 'secure_access': 'https://empty.example.com',
'public-ipv4': utils.LOCAL_IPV4, 'public-ipv4': LOCAL_IPV4,
} }
) )
...@@ -2776,7 +2820,7 @@ class TestMalformedBackenUrlSlave(SlaveHttpFrontendTestCase, ...@@ -2776,7 +2820,7 @@ class TestMalformedBackenUrlSlave(SlaveHttpFrontendTestCase,
parameter_dict['domain'], parameter_dict['public-ipv4'], 'test-path') parameter_dict['domain'], parameter_dict['public-ipv4'], 'test-path')
self.assertEqual( self.assertEqual(
utils.der2pem(result.peercert), der2pem(result.peercert),
open('wildcard.example.com.crt').read()) open('wildcard.example.com.crt').read())
self.assertEqual(result.status_code, no_backend_response_code) self.assertEqual(result.status_code, no_backend_response_code)
...@@ -2830,9 +2874,9 @@ class TestDefaultMonitorHttpdPort(SlaveHttpFrontendTestCase, TestDataMixin): ...@@ -2830,9 +2874,9 @@ class TestDefaultMonitorHttpdPort(SlaveHttpFrontendTestCase, TestDataMixin):
'monitor-httpd.conf')).read() 'monitor-httpd.conf')).read()
self.assertTrue( self.assertTrue(
'Listen [%s]:8196' % (utils.GLOBAL_IPV6,) in master_monitor_conf) 'Listen [%s]:8196' % (GLOBAL_IPV6,) in master_monitor_conf)
self.assertTrue( self.assertTrue(
'Listen [%s]:8072' % (utils.GLOBAL_IPV6,) in slave_monitor_conf) 'Listen [%s]:8072' % (GLOBAL_IPV6,) in slave_monitor_conf)
class TestQuicEnabled(SlaveHttpFrontendTestCase, TestDataMixin): class TestQuicEnabled(SlaveHttpFrontendTestCase, TestDataMixin):
...@@ -2841,7 +2885,7 @@ class TestQuicEnabled(SlaveHttpFrontendTestCase, TestDataMixin): ...@@ -2841,7 +2885,7 @@ class TestQuicEnabled(SlaveHttpFrontendTestCase, TestDataMixin):
return { return {
'domain': 'example.com', 'domain': 'example.com',
'nginx-domain': 'nginx.example.com', 'nginx-domain': 'nginx.example.com',
'public-ipv4': utils.LOCAL_IPV4, 'public-ipv4': LOCAL_IPV4,
'enable-quic': 'true', 'enable-quic': 'true',
'apache-certificate': open('wildcard.example.com.crt').read(), 'apache-certificate': open('wildcard.example.com.crt').read(),
'apache-key': open('wildcard.example.com.key').read(), 'apache-key': open('wildcard.example.com.key').read(),
...@@ -2889,7 +2933,7 @@ class TestQuicEnabled(SlaveHttpFrontendTestCase, TestDataMixin): ...@@ -2889,7 +2933,7 @@ class TestQuicEnabled(SlaveHttpFrontendTestCase, TestDataMixin):
'url': 'http://url.example.com', 'url': 'http://url.example.com',
'site_url': 'http://url.example.com', 'site_url': 'http://url.example.com',
'secure_access': 'https://url.example.com', 'secure_access': 'https://url.example.com',
'public-ipv4': utils.LOCAL_IPV4, 'public-ipv4': LOCAL_IPV4,
} }
) )
...@@ -2897,7 +2941,7 @@ class TestQuicEnabled(SlaveHttpFrontendTestCase, TestDataMixin): ...@@ -2897,7 +2941,7 @@ class TestQuicEnabled(SlaveHttpFrontendTestCase, TestDataMixin):
parameter_dict['domain'], parameter_dict['public-ipv4'], 'test-path') parameter_dict['domain'], parameter_dict['public-ipv4'], 'test-path')
self.assertEqual( self.assertEqual(
utils.der2pem(result.peercert), der2pem(result.peercert),
open('wildcard.example.com.crt').read()) open('wildcard.example.com.crt').read())
self.assertEqualResultJson(result, 'Path', '/test-path') self.assertEqualResultJson(result, 'Path', '/test-path')
......
software/caddy-frontend/test/utils.py
View file @ 10781d84
...@@ -28,35 +28,17 @@ ...@@ -28,35 +28,17 @@
import unittest import unittest
import os import os
import socket import socket
import subprocess
from contextlib import closing from contextlib import closing
import logging import logging
import StringIO import StringIO
import json
from BaseHTTPServer import HTTPServer
from BaseHTTPServer import BaseHTTPRequestHandler
import xmlrpclib import xmlrpclib
import supervisor.xmlrpc
import supervisor.xmlrpc
from erp5.util.testnode.SlapOSControler import SlapOSControler from erp5.util.testnode.SlapOSControler import SlapOSControler
from erp5.util.testnode.ProcessManager import ProcessManager from erp5.util.testnode.ProcessManager import ProcessManager
LOCAL_IPV4 = os.environ['LOCAL_IPV4'] # Utility functions
GLOBAL_IPV6 = os.environ['GLOBAL_IPV6']
def der2pem(der):
certificate, error = subprocess.Popen(
'openssl x509 -inform der'.split(), stdin=subprocess.PIPE,
stdout=subprocess.PIPE, stderr=subprocess.PIPE
).communicate(der)
if error:
raise ValueError(error)
return certificate
def findFreeTCPPort(ip=''): def findFreeTCPPort(ip=''):
"""Find a free TCP port to listen to. """Find a free TCP port to listen to.
""" """
...@@ -66,7 +48,57 @@ def findFreeTCPPort(ip=''): ...@@ -66,7 +48,57 @@ def findFreeTCPPort(ip=''):
return s.getsockname()[1] return s.getsockname()[1]
# TODO:
# - allow requesting multiple instances ?
class SlapOSInstanceTestCase(unittest.TestCase): class SlapOSInstanceTestCase(unittest.TestCase):
"""Install one slapos instance.
This test case install software(s) and request one instance during `setUpClass`
and destroy the instance during `tearDownClass`.
Software Release URL, Instance Software Type and Instance Parameters can be defined
on the class.
All tests from the test class will run with the same instance.
The following class attributes are available:
* `computer_partition`: the computer partition instance, implementing
`slapos.slap.interface.slap.IComputerPartition`.
* `computer_partition_root_path`: the path of the instance root directory.
"""
# Methods to be defined by subclasses.
@classmethod
def getSoftwareURLList(cls):
"""Return URL of software releases to install.
To be defined by subclasses.
"""
raise NotImplementedError()
@classmethod
def getInstanceParameterDict(cls):
"""Return instance parameters
To be defined by subclasses if they need to request instance with specific
parameters.
"""
return {}
@classmethod
def getInstanceSoftwareType(cls):
"""Return software type for instance, default "default"
To be defined by subclasses if they need to request instance with specific
software type.
"""
return "default"
# Utility methods.
def getSupervisorRPCServer(self): def getSupervisorRPCServer(self):
"""Returns a XML-RPC connection to the supervisor used by slapos node """Returns a XML-RPC connection to the supervisor used by slapos node
...@@ -79,30 +111,52 @@ class SlapOSInstanceTestCase(unittest.TestCase): ...@@ -79,30 +111,52 @@ class SlapOSInstanceTestCase(unittest.TestCase):
None, None,
None, None,
# XXX hardcoded socket path # XXX hardcoded socket path
serverurl="unix://{working_directory}/inst/supervisord.socket" serverurl="unix://{working_directory}/inst/supervisord.socket".format(
.format(**self.config))) **self.config)))
# Unittest methods
@classmethod @classmethod
def getSoftwareURLList(cls): def setUpClass(cls):
"""Return URL of software releases to install. """Setup the class, build software and request an instance.
To be defined by subclasses. If you have to override this method, do not forget to call this method on
parent class.
""" """
return [os.path.realpath(os.environ['TEST_SR'])] try:
cls.setUpWorkingDirectory()
cls.setUpConfig()
cls.setUpSlapOSController()
@classmethod cls.runSoftwareRelease()
def getInstanceParameterDict(cls): # XXX instead of "runSoftwareRelease", it would be better to be closer to slapos usage:
"""Return instance parameters # cls.supplySoftwares()
# cls.installSoftwares()
To be defined by subclasses if they need to request instance with specific cls.runComputerPartition()
parameters. # XXX instead of "runComputerPartition", it would be better to be closer to slapos usage:
# cls.requestInstances()
# cls.createInstances()
# cls.requestInstances()
except Exception:
cls.stopSlapOSProcesses()
raise
@classmethod
def tearDownClass(cls):
"""Tear down class, stop the processes and destroy instance.
""" """
return {} cls.stopSlapOSProcesses()
# TODO: allow subclasses to request a specific software type ? # Implementation
@classmethod
def stopSlapOSProcesses(cls):
if hasattr(cls, '_process_manager'):
cls._process_manager.killPreviousRun()
@classmethod @classmethod
def setUpWorkingDirectory(cls): def setUpWorkingDirectory(cls):
"""Initialise the directories"""
cls.working_directory = os.environ.get( cls.working_directory = os.environ.get(
'SLAPOS_TEST_WORKING_DIR', 'SLAPOS_TEST_WORKING_DIR',
os.path.join(os.path.dirname(__file__), '.slapos')) os.path.join(os.path.dirname(__file__), '.slapos'))
...@@ -110,16 +164,18 @@ class SlapOSInstanceTestCase(unittest.TestCase): ...@@ -110,16 +164,18 @@ class SlapOSInstanceTestCase(unittest.TestCase):
# AF_UNIX path too long This `working_directory` should not be too deep. # AF_UNIX path too long This `working_directory` should not be too deep.
# Socket path is 108 char max on linux # Socket path is 108 char max on linux
# https://github.com/torvalds/linux/blob/3848ec5/net/unix/af_unix.c#L234-L238 # https://github.com/torvalds/linux/blob/3848ec5/net/unix/af_unix.c#L234-L238
# Supervisord socket name contains the pid number, which is why we add
# .xxxxxxx in this check.
if len(cls.working_directory + '/inst/supervisord.socket.xxxxxxx') > 108: if len(cls.working_directory + '/inst/supervisord.socket.xxxxxxx') > 108:
raise RuntimeError( raise RuntimeError('working directory ( {} ) is too deep, try setting '
'working directory ( {} ) is too deep, try setting ' 'SLAPOS_TEST_WORKING_DIR'.format(cls.working_directory))
'SLAPOS_TEST_WORKING_DIR'.format(cls.working_directory))
if not os.path.exists(cls.working_directory): if not os.path.exists(cls.working_directory):
os.mkdir(cls.working_directory) os.mkdir(cls.working_directory)
@classmethod @classmethod
def setUpConfig(cls): def setUpConfig(cls):
"""Create slapos configuration"""
cls.config = { cls.config = {
"working_directory": cls.working_directory, "working_directory": cls.working_directory,
"slapos_directory": cls.working_directory, "slapos_directory": cls.working_directory,
...@@ -130,7 +186,8 @@ class SlapOSInstanceTestCase(unittest.TestCase): ...@@ -130,7 +186,8 @@ class SlapOSInstanceTestCase(unittest.TestCase):
# "proper" slapos command must be in $PATH # "proper" slapos command must be in $PATH
'slapos_binary': 'slapos', 'slapos_binary': 'slapos',
} }
ipv4_address = LOCAL_IPV4 # Some tests are expecting that local IP is not set to 127.0.0.1
ipv4_address = os.environ.get('LOCAL_IPV4', '127.0.1.1')
ipv6_address = os.environ['GLOBAL_IPV6'] ipv6_address = os.environ['GLOBAL_IPV6']
cls.config['proxy_host'] = cls.config['ipv4_address'] = ipv4_address cls.config['proxy_host'] = cls.config['ipv4_address'] = ipv4_address
...@@ -141,6 +198,15 @@ class SlapOSInstanceTestCase(unittest.TestCase): ...@@ -141,6 +198,15 @@ class SlapOSInstanceTestCase(unittest.TestCase):
@classmethod @classmethod
def setUpSlapOSController(cls): def setUpSlapOSController(cls):
"""Create the a "slapos controller" and supply softwares from `getSoftwareURLList`.
This is equivalent to:
slapos proxy start
for sr in getSoftwareURLList; do
slapos supply $SR $COMP
done
"""
cls._process_manager = ProcessManager() cls._process_manager = ProcessManager()
# XXX this code is copied from testnode code # XXX this code is copied from testnode code
...@@ -160,12 +226,21 @@ class SlapOSInstanceTestCase(unittest.TestCase): ...@@ -160,12 +226,21 @@ class SlapOSInstanceTestCase(unittest.TestCase):
reset_software=False, reset_software=False,
software_path_list=cls.software_url_list) software_path_list=cls.software_url_list)
# XXX we should check *earlier* if that pidfile exist and if supervisord
# process still running, because if developer started supervisord (or bugs?)
# then another supervisord will start and starting services a second time
# will fail.
cls._process_manager.supervisord_pid_file = os.path.join( cls._process_manager.supervisord_pid_file = os.path.join(
cls.slapos_controler.instance_root, 'var', 'run', 'supervisord.pid') cls.slapos_controler.instance_root, 'var', 'run', 'supervisord.pid')
@classmethod @classmethod
def runSoftwareRelease(cls): def runSoftwareRelease(cls):
"""Run all the software releases that were supplied before.
This is the equivalent of `slapos node software`.
The tests will be marked file if software building fail.
"""
logger = logging.getLogger() logger = logging.getLogger()
logger.level = logging.DEBUG logger.level = logging.DEBUG
stream = StringIO.StringIO() stream = StringIO.StringIO()
...@@ -183,14 +258,29 @@ class SlapOSInstanceTestCase(unittest.TestCase): ...@@ -183,14 +258,29 @@ class SlapOSInstanceTestCase(unittest.TestCase):
logger.removeHandler(stream_handler) logger.removeHandler(stream_handler)
del stream del stream
@classmethod @classmethod
def runComputerPartition(cls): def runComputerPartition(cls):
"""Instanciate the software.
This is the equivalent of doing:
slapos request --type=getInstanceSoftwareType --parameters=getInstanceParameterDict
slapos node instance
and return the slapos request instance parameters.
This can be called by tests to simulate re-request with different parameters.
"""
logger = logging.getLogger() logger = logging.getLogger()
logger.level = logging.DEBUG logger.level = logging.DEBUG
stream = StringIO.StringIO() stream = StringIO.StringIO()
stream_handler = logging.StreamHandler(stream) stream_handler = logging.StreamHandler(stream)
logger.addHandler(stream_handler) logger.addHandler(stream_handler)
if cls.getInstanceSoftwareType() != 'default':
raise NotImplementedError
instance_parameter_dict = cls.getInstanceParameterDict() instance_parameter_dict = cls.getInstanceParameterDict()
try: try:
cls.instance_status_dict = cls.slapos_controler.runComputerPartition( cls.instance_status_dict = cls.slapos_controler.runComputerPartition(
...@@ -221,53 +311,11 @@ class SlapOSInstanceTestCase(unittest.TestCase): ...@@ -221,53 +311,11 @@ class SlapOSInstanceTestCase(unittest.TestCase):
# the ComputerPartition instances, to getInstanceParameterDict # the ComputerPartition instances, to getInstanceParameterDict
cls.computer_partition = computer_partition_list[0] cls.computer_partition = computer_partition_list[0]
# expose instance directory
cls.instance_path = os.path.join(
cls.config['working_directory'],
'inst')
# the path of the instance on the filesystem, for low level inspection # the path of the instance on the filesystem, for low level inspection
cls.computer_partition_root_path = os.path.join( cls.computer_partition_root_path = os.path.join(
cls.instance_path, cls.config['working_directory'],
'inst',
cls.computer_partition.getId()) cls.computer_partition.getId())
# expose software directory, extract from found computer partition
cls.software_path = os.path.realpath(os.path.join(
cls.computer_partition_root_path, 'software_release'))
@classmethod
def setUpClass(cls):
try:
cls.setUpWorkingDirectory()
cls.setUpConfig()
cls.setUpSlapOSController()
cls.runSoftwareRelease()
cls.runComputerPartition()
except Exception:
cls.tearDownClass()
raise
@classmethod
def tearDownClass(cls):
if getattr(cls, '_process_manager', None) is not None:
cls._process_manager.killPreviousRun()
class TestHandler(BaseHTTPRequestHandler):
def do_GET(self):
self.send_response(200)
self.send_header("Content-type", "application/json")
self.send_header('Set-Cookie', 'secured=value;secure')
self.send_header('Set-Cookie', 'nonsecured=value')
self.end_headers()
response = {
'Path': self.path,
'Incoming Headers': self.headers.dict
}
self.wfile.write(json.dumps(response, indent=2))
if __name__ == '__main__':
ip = LOCAL_IPV4
port = 8888
server = HTTPServer((ip, port), TestHandler)
print 'http://%s:%s' % server.server_address
server.serve_forever()
software/erp5testnode/testsuite/caddy-frontend/buildout.hash.cfg
View file @ 10781d84
...@@ -15,4 +15,4 @@ ...@@ -15,4 +15,4 @@
[template] [template]
filename = instance.cfg filename = instance.cfg
md5sum = 2eba374ea5b7ec6c95a1f79066cfb46b md5sum = a345d46655c3e841c2ecf4e3a0446c8f
software/erp5testnode/testsuite/caddy-frontend/instance.cfg
View file @ 10781d84
...@@ -36,10 +36,9 @@ command-line = ...@@ -36,10 +36,9 @@ command-line =
--source_code_path_list=$${slapos:location}/software/caddy-frontend/test --source_code_path_list=$${slapos:location}/software/caddy-frontend/test
# XXX slapos.cookbook:wrapper does not allow extending env, so we add some default $PATH entries ( not sure they are needed ) # XXX slapos.cookbook:wrapper does not allow extending env, so we add some default $PATH entries ( not sure they are needed )
# PATH=${buildout:bin-directory}:/usr/bin/:/bin/
environment = environment =
PATH=${curl:location}/bin/:${openssl:location}/bin/:/usr/bin/:/bin
LOCAL_IPV4=$${slap-configuration:ipv4-random} LOCAL_IPV4=$${slap-configuration:ipv4-random}
GLOBAL_IPV6=$${slap-configuration:ipv6-random} GLOBAL_IPV6=$${slap-configuration:ipv6-random}
CURL=${curl:location}/bin/curl
SLAPOS_TEST_WORKING_DIR=$${create-directory:working-dir} SLAPOS_TEST_WORKING_DIR=$${create-directory:working-dir}
TEST_SR=${template:test_software_release} TEST_SR=${template:test_software_release}
software/proftpd/test/utils.py
View file @ 10781d84
...@@ -30,14 +30,15 @@ import os ...@@ -30,14 +30,15 @@ import os
import socket import socket
from contextlib import closing from contextlib import closing
import logging import logging
import StringIO
import xmlrpclib import xmlrpclib
import supervisor.xmlrpc import supervisor.xmlrpc
from erp5.util.testnode.SlapOSControler import SlapOSControler from erp5.util.testnode.SlapOSControler import SlapOSControler
from erp5.util.testnode.ProcessManager import ProcessManager from erp5.util.testnode.ProcessManager import ProcessManager
import slapos
# Utility functions
def findFreeTCPPort(ip=''): def findFreeTCPPort(ip=''):
"""Find a free TCP port to listen to. """Find a free TCP port to listen to.
""" """
...@@ -47,7 +48,30 @@ def findFreeTCPPort(ip=''): ...@@ -47,7 +48,30 @@ def findFreeTCPPort(ip=''):
return s.getsockname()[1] return s.getsockname()[1]
# TODO:
# - allow requesting multiple instances ?
class SlapOSInstanceTestCase(unittest.TestCase): class SlapOSInstanceTestCase(unittest.TestCase):
"""Install one slapos instance.
This test case install software(s) and request one instance during `setUpClass`
and destroy the instance during `tearDownClass`.
Software Release URL, Instance Software Type and Instance Parameters can be defined
on the class.
All tests from the test class will run with the same instance.
The following class attributes are available:
* `computer_partition`: the computer partition instance, implementing
`slapos.slap.interface.slap.IComputerPartition`.
* `computer_partition_root_path`: the path of the instance root directory.
"""
# Methods to be defined by subclasses.
@classmethod @classmethod
def getSoftwareURLList(cls): def getSoftwareURLList(cls):
"""Return URL of software releases to install. """Return URL of software releases to install.
...@@ -65,20 +89,75 @@ class SlapOSInstanceTestCase(unittest.TestCase): ...@@ -65,20 +89,75 @@ class SlapOSInstanceTestCase(unittest.TestCase):
""" """
return {} return {}
# TODO: allow subclasses to request a specific software type ? @classmethod
def getInstanceSoftwareType(cls):
"""Return software type for instance, default "default"
To be defined by subclasses if they need to request instance with specific
software type.
"""
return "default"
# Utility methods.
def getSupervisorRPCServer(self):
"""Returns a XML-RPC connection to the supervisor used by slapos node
Refer to http://supervisord.org/api.html for details of available methods.
"""
# xmlrpc over unix socket https://stackoverflow.com/a/11746051/7294664
return xmlrpclib.ServerProxy(
'http://slapos-supervisor',
transport=supervisor.xmlrpc.SupervisorTransport(
None,
None,
# XXX hardcoded socket path
serverurl="unix://{working_directory}/inst/supervisord.socket".format(
**self.config)))
# Unittest methods
@classmethod @classmethod
def setUpClass(cls): def setUpClass(cls):
"""Setup the class, build software and request an instance.
If you have to override this method, do not forget to call this method on
parent class.
"""
try: try:
cls._setUpClass() cls.setUpWorkingDirectory()
except: cls.setUpConfig()
cls.setUpSlapOSController()
cls.runSoftwareRelease()
# XXX instead of "runSoftwareRelease", it would be better to be closer to slapos usage:
# cls.supplySoftwares()
# cls.installSoftwares()
cls.runComputerPartition()
# XXX instead of "runComputerPartition", it would be better to be closer to slapos usage:
# cls.requestInstances()
# cls.createInstances()
# cls.requestInstances()
except Exception:
cls.stopSlapOSProcesses() cls.stopSlapOSProcesses()
raise raise
@classmethod @classmethod
def _setUpClass(cls): def tearDownClass(cls):
working_directory = os.environ.get( """Tear down class, stop the processes and destroy instance.
"""
cls.stopSlapOSProcesses()
# Implementation
@classmethod
def stopSlapOSProcesses(cls):
if hasattr(cls, '_process_manager'):
cls._process_manager.killPreviousRun()
@classmethod
def setUpWorkingDirectory(cls):
"""Initialise the directories"""
cls.working_directory = os.environ.get(
'SLAPOS_TEST_WORKING_DIR', 'SLAPOS_TEST_WORKING_DIR',
os.path.join(os.path.dirname(__file__), '.slapos')) os.path.join(os.path.dirname(__file__), '.slapos'))
# To prevent error: Cannot open an HTTP server: socket.error reported # To prevent error: Cannot open an HTTP server: socket.error reported
...@@ -87,76 +166,146 @@ class SlapOSInstanceTestCase(unittest.TestCase): ...@@ -87,76 +166,146 @@ class SlapOSInstanceTestCase(unittest.TestCase):
# https://github.com/torvalds/linux/blob/3848ec5/net/unix/af_unix.c#L234-L238 # https://github.com/torvalds/linux/blob/3848ec5/net/unix/af_unix.c#L234-L238
# Supervisord socket name contains the pid number, which is why we add # Supervisord socket name contains the pid number, which is why we add
# .xxxxxxx in this check. # .xxxxxxx in this check.
if len(working_directory + '/inst/supervisord.socket.xxxxxxx') > 108: if len(cls.working_directory + '/inst/supervisord.socket.xxxxxxx') > 108:
raise RuntimeError('working directory ( {} ) is too deep, try setting ' raise RuntimeError('working directory ( {} ) is too deep, try setting '
'SLAPOS_TEST_WORKING_DIR'.format(working_directory)) 'SLAPOS_TEST_WORKING_DIR'.format(cls.working_directory))
if not os.path.exists(working_directory): if not os.path.exists(cls.working_directory):
os.mkdir(working_directory) os.mkdir(cls.working_directory)
cls.config = config = { @classmethod
"working_directory": working_directory, def setUpConfig(cls):
"slapos_directory": working_directory, """Create slapos configuration"""
"log_directory": working_directory, cls.config = {
"computer_id": 'slapos.test', # XXX "working_directory": cls.working_directory,
'proxy_database': os.path.join(working_directory, 'proxy.db'), "slapos_directory": cls.working_directory,
"log_directory": cls.working_directory,
"computer_id": 'slapos.test', # XXX
'proxy_database': os.path.join(cls.working_directory, 'proxy.db'),
'partition_reference': cls.__name__, 'partition_reference': cls.__name__,
# "proper" slapos command must be in $PATH # "proper" slapos command must be in $PATH
'slapos_binary': 'slapos', 'slapos_binary': 'slapos',
} }
# Some tests are expecting that local IP is not set to 127.0.0.1 # Some tests are expecting that local IP is not set to 127.0.0.1
ipv4_address = os.environ.get('LOCAL_IPV4', '127.0.1.1') ipv4_address = os.environ.get('LOCAL_IPV4', '127.0.1.1')
ipv6_address = os.environ['GLOBAL_IPV6'] ipv6_address = os.environ['GLOBAL_IPV6']
config['proxy_host'] = config['ipv4_address'] = ipv4_address cls.config['proxy_host'] = cls.config['ipv4_address'] = ipv4_address
config['ipv6_address'] = ipv6_address cls.config['ipv6_address'] = ipv6_address
config['proxy_port'] = findFreeTCPPort(ipv4_address) cls.config['proxy_port'] = findFreeTCPPort(ipv4_address)
config['master_url'] = 'http://{proxy_host}:{proxy_port}'.format(**config) cls.config['master_url'] = 'http://{proxy_host}:{proxy_port}'.format(
**cls.config)
cls._process_manager = process_manager = ProcessManager() @classmethod
def setUpSlapOSController(cls):
"""Create the a "slapos controller" and supply softwares from `getSoftwareURLList`.
This is equivalent to:
slapos proxy start
for sr in getSoftwareURLList; do
slapos supply $SR $COMP
done
"""
cls._process_manager = ProcessManager()
# XXX this code is copied from testnode code # XXX this code is copied from testnode code
slapos_controler = SlapOSControler( cls.slapos_controler = SlapOSControler(
working_directory, cls.working_directory,
config cls.config
) )
slapproxy_log = os.path.join(config['log_directory'], 'slapproxy.log') slapproxy_log = os.path.join(cls.config['log_directory'], 'slapproxy.log')
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
logger.debug('Configured slapproxy log to %r', slapproxy_log) logger.debug('Configured slapproxy log to %r', slapproxy_log)
software_url_list = cls.getSoftwareURLList() cls.software_url_list = cls.getSoftwareURLList()
slapos_controler.initializeSlapOSControler( cls.slapos_controler.initializeSlapOSControler(
slapproxy_log=slapproxy_log, slapproxy_log=slapproxy_log,
process_manager=process_manager, process_manager=cls._process_manager,
reset_software=False, reset_software=False,
software_path_list=software_url_list) software_path_list=cls.software_url_list)
# XXX we should check *earlier* if that pidfile exist and if supervisord
# process still running, because if developer started supervisord (or bugs?)
# then another supervisord will start and starting services a second time
# will fail.
cls._process_manager.supervisord_pid_file = os.path.join(
cls.slapos_controler.instance_root, 'var', 'run', 'supervisord.pid')
process_manager.supervisord_pid_file = os.path.join( @classmethod
slapos_controler.instance_root, 'var', 'run', 'supervisord.pid') def runSoftwareRelease(cls):
"""Run all the software releases that were supplied before.
This is the equivalent of `slapos node software`.
The tests will be marked file if software building fail.
"""
logger = logging.getLogger()
logger.level = logging.DEBUG
stream = StringIO.StringIO()
stream_handler = logging.StreamHandler(stream)
logger.addHandler(stream_handler)
try:
cls.software_status_dict = cls.slapos_controler.runSoftwareRelease(
cls.config, environment=os.environ)
stream.seek(0)
stream.flush()
message = ''.join(stream.readlines()[-100:])
assert cls.software_status_dict['status_code'] == 0, message
finally:
logger.removeHandler(stream_handler)
del stream
software_status_dict = slapos_controler.runSoftwareRelease(config, environment=os.environ)
# TODO: log more details in this case @classmethod
assert software_status_dict['status_code'] == 0 def runComputerPartition(cls):
"""Instanciate the software.
This is the equivalent of doing:
slapos request --type=getInstanceSoftwareType --parameters=getInstanceParameterDict
slapos node instance
and return the slapos request instance parameters.
This can be called by tests to simulate re-request with different parameters.
"""
logger = logging.getLogger()
logger.level = logging.DEBUG
stream = StringIO.StringIO()
stream_handler = logging.StreamHandler(stream)
logger.addHandler(stream_handler)
if cls.getInstanceSoftwareType() != 'default':
raise NotImplementedError
instance_parameter_dict = cls.getInstanceParameterDict() instance_parameter_dict = cls.getInstanceParameterDict()
instance_status_dict = slapos_controler.runComputerPartition( try:
config, cls.instance_status_dict = cls.slapos_controler.runComputerPartition(
cls.config,
cluster_configuration=instance_parameter_dict, cluster_configuration=instance_parameter_dict,
environment=os.environ) environment=os.environ)
# TODO: log more details in this case stream.seek(0)
assert instance_status_dict['status_code'] == 0 stream.flush()
message = ''.join(stream.readlines()[-100:])
# FIXME: similar to test node, only one (root) partition is really supported for now. assert cls.instance_status_dict['status_code'] == 0, message
finally:
logger.removeHandler(stream_handler)
del stream
# FIXME: similar to test node, only one (root) partition is really
# supported for now.
computer_partition_list = [] computer_partition_list = []
for i in range(len(software_url_list)): for i in range(len(cls.software_url_list)):
computer_partition_list.append( computer_partition_list.append(
slapos_controler.slap.registerOpenOrder().request( cls.slapos_controler.slap.registerOpenOrder().request(
software_url_list[i], cls.software_url_list[i],
# This is how testnode's SlapOSControler name created partitions # This is how testnode's SlapOSControler name created partitions
partition_reference='testing partition {i}'.format(i=i, **config), partition_reference='testing partition {i}'.format(
partition_parameter_kw=instance_parameter_dict)) i=i, **cls.config),
partition_parameter_kw=instance_parameter_dict))
# expose some class attributes so that tests can use them: # expose some class attributes so that tests can use them:
# the ComputerPartition instances, to getInstanceParameterDict # the ComputerPartition instances, to getInstanceParameterDict
...@@ -164,31 +313,9 @@ class SlapOSInstanceTestCase(unittest.TestCase): ...@@ -164,31 +313,9 @@ class SlapOSInstanceTestCase(unittest.TestCase):
# the path of the instance on the filesystem, for low level inspection # the path of the instance on the filesystem, for low level inspection
cls.computer_partition_root_path = os.path.join( cls.computer_partition_root_path = os.path.join(
config['working_directory'], cls.config['working_directory'],
'inst', 'inst',
cls.computer_partition.getId()) cls.computer_partition.getId())
@classmethod
def stopSlapOSProcesses(cls):
if hasattr(cls, '_process_manager'):
cls._process_manager.killPreviousRun()
@classmethod
def tearDownClass(cls):
cls.stopSlapOSProcesses()
# utility methods
def getSupervisorRPCServer(self):
"""Returns a XML-RPC connection to the supervisor used by slapos node
Refer to http://supervisord.org/api.html for details of available methods.
"""
# xmlrpc over unix socket https://stackoverflow.com/a/11746051/7294664
return xmlrpclib.ServerProxy(
'http://slapos-supervisor',
transport=supervisor.xmlrpc.SupervisorTransport(
None,
None,
# XXX hardcoded socket path
serverurl="unix://{working_directory}/inst/supervisord.socket".format(**self.config)))
software/re6stnet/test/utils.py
View file @ 10781d84
...@@ -30,14 +30,15 @@ import os ...@@ -30,14 +30,15 @@ import os
import socket import socket
from contextlib import closing from contextlib import closing
import logging import logging
import StringIO
import xmlrpclib import xmlrpclib
import supervisor.xmlrpc import supervisor.xmlrpc
from erp5.util.testnode.SlapOSControler import SlapOSControler from erp5.util.testnode.SlapOSControler import SlapOSControler
from erp5.util.testnode.ProcessManager import ProcessManager from erp5.util.testnode.ProcessManager import ProcessManager
import slapos
# Utility functions
def findFreeTCPPort(ip=''): def findFreeTCPPort(ip=''):
"""Find a free TCP port to listen to. """Find a free TCP port to listen to.
""" """
...@@ -47,7 +48,30 @@ def findFreeTCPPort(ip=''): ...@@ -47,7 +48,30 @@ def findFreeTCPPort(ip=''):
return s.getsockname()[1] return s.getsockname()[1]
# TODO:
# - allow requesting multiple instances ?
class SlapOSInstanceTestCase(unittest.TestCase): class SlapOSInstanceTestCase(unittest.TestCase):
"""Install one slapos instance.
This test case install software(s) and request one instance during `setUpClass`
and destroy the instance during `tearDownClass`.
Software Release URL, Instance Software Type and Instance Parameters can be defined
on the class.
All tests from the test class will run with the same instance.
The following class attributes are available:
* `computer_partition`: the computer partition instance, implementing
`slapos.slap.interface.slap.IComputerPartition`.
* `computer_partition_root_path`: the path of the instance root directory.
"""
# Methods to be defined by subclasses.
@classmethod @classmethod
def getSoftwareURLList(cls): def getSoftwareURLList(cls):
"""Return URL of software releases to install. """Return URL of software releases to install.
...@@ -65,20 +89,75 @@ class SlapOSInstanceTestCase(unittest.TestCase): ...@@ -65,20 +89,75 @@ class SlapOSInstanceTestCase(unittest.TestCase):
""" """
return {} return {}
# TODO: allow subclasses to request a specific software type ? @classmethod
def getInstanceSoftwareType(cls):
"""Return software type for instance, default "default"
To be defined by subclasses if they need to request instance with specific
software type.
"""
return "default"
# Utility methods.
def getSupervisorRPCServer(self):
"""Returns a XML-RPC connection to the supervisor used by slapos node
Refer to http://supervisord.org/api.html for details of available methods.
"""
# xmlrpc over unix socket https://stackoverflow.com/a/11746051/7294664
return xmlrpclib.ServerProxy(
'http://slapos-supervisor',
transport=supervisor.xmlrpc.SupervisorTransport(
None,
None,
# XXX hardcoded socket path
serverurl="unix://{working_directory}/inst/supervisord.socket".format(
**self.config)))
# Unittest methods
@classmethod @classmethod
def setUpClass(cls): def setUpClass(cls):
"""Setup the class, build software and request an instance.
If you have to override this method, do not forget to call this method on
parent class.
"""
try: try:
cls._setUpClass() cls.setUpWorkingDirectory()
except: cls.setUpConfig()
cls.setUpSlapOSController()
cls.runSoftwareRelease()
# XXX instead of "runSoftwareRelease", it would be better to be closer to slapos usage:
# cls.supplySoftwares()
# cls.installSoftwares()
cls.runComputerPartition()
# XXX instead of "runComputerPartition", it would be better to be closer to slapos usage:
# cls.requestInstances()
# cls.createInstances()
# cls.requestInstances()
except Exception:
cls.stopSlapOSProcesses() cls.stopSlapOSProcesses()
raise raise
@classmethod @classmethod
def _setUpClass(cls): def tearDownClass(cls):
working_directory = os.environ.get( """Tear down class, stop the processes and destroy instance.
"""
cls.stopSlapOSProcesses()
# Implementation
@classmethod
def stopSlapOSProcesses(cls):
if hasattr(cls, '_process_manager'):
cls._process_manager.killPreviousRun()
@classmethod
def setUpWorkingDirectory(cls):
"""Initialise the directories"""
cls.working_directory = os.environ.get(
'SLAPOS_TEST_WORKING_DIR', 'SLAPOS_TEST_WORKING_DIR',
os.path.join(os.path.dirname(__file__), '.slapos')) os.path.join(os.path.dirname(__file__), '.slapos'))
# To prevent error: Cannot open an HTTP server: socket.error reported # To prevent error: Cannot open an HTTP server: socket.error reported
...@@ -87,76 +166,146 @@ class SlapOSInstanceTestCase(unittest.TestCase): ...@@ -87,76 +166,146 @@ class SlapOSInstanceTestCase(unittest.TestCase):
# https://github.com/torvalds/linux/blob/3848ec5/net/unix/af_unix.c#L234-L238 # https://github.com/torvalds/linux/blob/3848ec5/net/unix/af_unix.c#L234-L238
# Supervisord socket name contains the pid number, which is why we add # Supervisord socket name contains the pid number, which is why we add
# .xxxxxxx in this check. # .xxxxxxx in this check.
if len(working_directory + '/inst/supervisord.socket.xxxxxxx') > 108: if len(cls.working_directory + '/inst/supervisord.socket.xxxxxxx') > 108:
raise RuntimeError('working directory ( {} ) is too deep, try setting ' raise RuntimeError('working directory ( {} ) is too deep, try setting '
'SLAPOS_TEST_WORKING_DIR'.format(working_directory)) 'SLAPOS_TEST_WORKING_DIR'.format(cls.working_directory))
if not os.path.exists(working_directory): if not os.path.exists(cls.working_directory):
os.mkdir(working_directory) os.mkdir(cls.working_directory)
cls.config = config = { @classmethod
"working_directory": working_directory, def setUpConfig(cls):
"slapos_directory": working_directory, """Create slapos configuration"""
"log_directory": working_directory, cls.config = {
"computer_id": 'slapos.test', # XXX "working_directory": cls.working_directory,
'proxy_database': os.path.join(working_directory, 'proxy.db'), "slapos_directory": cls.working_directory,
"log_directory": cls.working_directory,
"computer_id": 'slapos.test', # XXX
'proxy_database': os.path.join(cls.working_directory, 'proxy.db'),
'partition_reference': cls.__name__, 'partition_reference': cls.__name__,
# "proper" slapos command must be in $PATH # "proper" slapos command must be in $PATH
'slapos_binary': 'slapos', 'slapos_binary': 'slapos',
} }
# Some tests are expecting that local IP is not set to 127.0.0.1 # Some tests are expecting that local IP is not set to 127.0.0.1
ipv4_address = os.environ.get('LOCAL_IPV4', '127.0.1.1') ipv4_address = os.environ.get('LOCAL_IPV4', '127.0.1.1')
ipv6_address = os.environ['GLOBAL_IPV6'] ipv6_address = os.environ['GLOBAL_IPV6']
config['proxy_host'] = config['ipv4_address'] = ipv4_address cls.config['proxy_host'] = cls.config['ipv4_address'] = ipv4_address
config['ipv6_address'] = ipv6_address cls.config['ipv6_address'] = ipv6_address
config['proxy_port'] = findFreeTCPPort(ipv4_address) cls.config['proxy_port'] = findFreeTCPPort(ipv4_address)
config['master_url'] = 'http://{proxy_host}:{proxy_port}'.format(**config) cls.config['master_url'] = 'http://{proxy_host}:{proxy_port}'.format(
**cls.config)
cls._process_manager = process_manager = ProcessManager() @classmethod
def setUpSlapOSController(cls):
"""Create the a "slapos controller" and supply softwares from `getSoftwareURLList`.
This is equivalent to:
slapos proxy start
for sr in getSoftwareURLList; do
slapos supply $SR $COMP
done
"""
cls._process_manager = ProcessManager()
# XXX this code is copied from testnode code # XXX this code is copied from testnode code
slapos_controler = SlapOSControler( cls.slapos_controler = SlapOSControler(
working_directory, cls.working_directory,
config cls.config
) )
slapproxy_log = os.path.join(config['log_directory'], 'slapproxy.log') slapproxy_log = os.path.join(cls.config['log_directory'], 'slapproxy.log')
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
logger.debug('Configured slapproxy log to %r', slapproxy_log) logger.debug('Configured slapproxy log to %r', slapproxy_log)
software_url_list = cls.getSoftwareURLList() cls.software_url_list = cls.getSoftwareURLList()
slapos_controler.initializeSlapOSControler( cls.slapos_controler.initializeSlapOSControler(
slapproxy_log=slapproxy_log, slapproxy_log=slapproxy_log,
process_manager=process_manager, process_manager=cls._process_manager,
reset_software=False, reset_software=False,
software_path_list=software_url_list) software_path_list=cls.software_url_list)
# XXX we should check *earlier* if that pidfile exist and if supervisord
# process still running, because if developer started supervisord (or bugs?)
# then another supervisord will start and starting services a second time
# will fail.
cls._process_manager.supervisord_pid_file = os.path.join(
cls.slapos_controler.instance_root, 'var', 'run', 'supervisord.pid')
process_manager.supervisord_pid_file = os.path.join( @classmethod
slapos_controler.instance_root, 'var', 'run', 'supervisord.pid') def runSoftwareRelease(cls):
"""Run all the software releases that were supplied before.
This is the equivalent of `slapos node software`.
The tests will be marked file if software building fail.
"""
logger = logging.getLogger()
logger.level = logging.DEBUG
stream = StringIO.StringIO()
stream_handler = logging.StreamHandler(stream)
logger.addHandler(stream_handler)
try:
cls.software_status_dict = cls.slapos_controler.runSoftwareRelease(
cls.config, environment=os.environ)
stream.seek(0)
stream.flush()
message = ''.join(stream.readlines()[-100:])
assert cls.software_status_dict['status_code'] == 0, message
finally:
logger.removeHandler(stream_handler)
del stream
software_status_dict = slapos_controler.runSoftwareRelease(config, environment=os.environ)
# TODO: log more details in this case @classmethod
assert software_status_dict['status_code'] == 0 def runComputerPartition(cls):
"""Instanciate the software.
This is the equivalent of doing:
slapos request --type=getInstanceSoftwareType --parameters=getInstanceParameterDict
slapos node instance
and return the slapos request instance parameters.
This can be called by tests to simulate re-request with different parameters.
"""
logger = logging.getLogger()
logger.level = logging.DEBUG
stream = StringIO.StringIO()
stream_handler = logging.StreamHandler(stream)
logger.addHandler(stream_handler)
if cls.getInstanceSoftwareType() != 'default':
raise NotImplementedError
instance_parameter_dict = cls.getInstanceParameterDict() instance_parameter_dict = cls.getInstanceParameterDict()
instance_status_dict = slapos_controler.runComputerPartition( try:
config, cls.instance_status_dict = cls.slapos_controler.runComputerPartition(
cls.config,
cluster_configuration=instance_parameter_dict, cluster_configuration=instance_parameter_dict,
environment=os.environ) environment=os.environ)
# TODO: log more details in this case stream.seek(0)
assert instance_status_dict['status_code'] == 0 stream.flush()
message = ''.join(stream.readlines()[-100:])
# FIXME: similar to test node, only one (root) partition is really supported for now. assert cls.instance_status_dict['status_code'] == 0, message
finally:
logger.removeHandler(stream_handler)
del stream
# FIXME: similar to test node, only one (root) partition is really
# supported for now.
computer_partition_list = [] computer_partition_list = []
for i in range(len(software_url_list)): for i in range(len(cls.software_url_list)):
computer_partition_list.append( computer_partition_list.append(
slapos_controler.slap.registerOpenOrder().request( cls.slapos_controler.slap.registerOpenOrder().request(
software_url_list[i], cls.software_url_list[i],
# This is how testnode's SlapOSControler name created partitions # This is how testnode's SlapOSControler name created partitions
partition_reference='testing partition {i}'.format(i=i, **config), partition_reference='testing partition {i}'.format(
partition_parameter_kw=instance_parameter_dict)) i=i, **cls.config),
partition_parameter_kw=instance_parameter_dict))
# expose some class attributes so that tests can use them: # expose some class attributes so that tests can use them:
# the ComputerPartition instances, to getInstanceParameterDict # the ComputerPartition instances, to getInstanceParameterDict
...@@ -164,31 +313,9 @@ class SlapOSInstanceTestCase(unittest.TestCase): ...@@ -164,31 +313,9 @@ class SlapOSInstanceTestCase(unittest.TestCase):
# the path of the instance on the filesystem, for low level inspection # the path of the instance on the filesystem, for low level inspection
cls.computer_partition_root_path = os.path.join( cls.computer_partition_root_path = os.path.join(
config['working_directory'], cls.config['working_directory'],
'inst', 'inst',
cls.computer_partition.getId()) cls.computer_partition.getId())
@classmethod
def stopSlapOSProcesses(cls):
if hasattr(cls, '_process_manager'):
cls._process_manager.killPreviousRun()
@classmethod
def tearDownClass(cls):
cls.stopSlapOSProcesses()
# utility methods
def getSupervisorRPCServer(self):
"""Returns a XML-RPC connection to the supervisor used by slapos node
Refer to http://supervisord.org/api.html for details of available methods.
"""
# xmlrpc over unix socket https://stackoverflow.com/a/11746051/7294664
return xmlrpclib.ServerProxy(
'http://slapos-supervisor',
transport=supervisor.xmlrpc.SupervisorTransport(
None,
None,
# XXX hardcoded socket path
serverurl="unix://{working_directory}/inst/supervisord.socket".format(**self.config)))
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