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

caddy-frontend: flake8ize test

parent e21900ff
...@@ -180,6 +180,7 @@ if os.environ.get('DEBUG'): ...@@ -180,6 +180,7 @@ if os.environ.get('DEBUG'):
import unittest import unittest
unittest.installHandler() unittest.installHandler()
def der2pem(der): def der2pem(der):
certificate, error = subprocess.Popen( certificate, error = subprocess.Popen(
'openssl x509 -inform der'.split(), stdin=subprocess.PIPE, 'openssl x509 -inform der'.split(), stdin=subprocess.PIPE,
...@@ -189,6 +190,7 @@ def der2pem(der): ...@@ -189,6 +190,7 @@ def der2pem(der):
raise ValueError(error) raise ValueError(error)
return certificate return certificate
def isHTTP2(domain, ip): def isHTTP2(domain, ip):
curl_command = 'curl --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/ '\
...@@ -317,7 +319,6 @@ class HttpFrontendTestCase(SlapOSInstanceTestCase): ...@@ -317,7 +319,6 @@ class HttpFrontendTestCase(SlapOSInstanceTestCase):
cls.software_path = os.path.realpath(os.path.join( cls.software_path = os.path.realpath(os.path.join(
cls.computer_partition_root_path, 'software_release')) 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:
......
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