Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
slapos
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Labels
Merge Requests
104
Merge Requests
104
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Jobs
Commits
Open sidebar
nexedi
slapos
Commits
eac1ae4f
Commit
eac1ae4f
authored
Sep 04, 2018
by
Łukasz Nowak
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
caddy-frontend: flake8ize test
parent
e21900ff
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
1 deletion
+2
-1
software/caddy-frontend/test/test.py
software/caddy-frontend/test/test.py
+2
-1
No files found.
software/caddy-frontend/test/test.py
View file @
eac1ae4f
...
@@ -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:
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment