Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
slapos-mynij-dev
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Mynij
slapos-mynij-dev
Commits
dddb4d20
Commit
dddb4d20
authored
Dec 20, 2018
by
Łukasz Nowak
Committed by
Łukasz Nowak
Dec 30, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix/caddy frontend monitor conf
/reviewed-on
nexedi/slapos!486
parent
203a32fc
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
14 additions
and
0 deletions
+14
-0
software/caddy-frontend/test/test.py
software/caddy-frontend/test/test.py
+14
-0
No files found.
software/caddy-frontend/test/test.py
View file @
dddb4d20
...
@@ -1069,6 +1069,20 @@ http://apachecustomhttpsaccepted.example.com:%%(http_port)s {
...
@@ -1069,6 +1069,20 @@ http://apachecustomhttpsaccepted.example.com:%%(http_port)s {
open
(
os
.
path
.
join
(
partition_path
,
'bin'
,
'nginx-wrapper'
),
'r'
).
read
()
open
(
os
.
path
.
join
(
partition_path
,
'bin'
,
'nginx-wrapper'
),
'r'
).
read
()
)
)
def
test_monitor_conf
(
self
):
monitor_conf_list
=
glob
.
glob
(
os
.
path
.
join
(
self
.
instance_path
,
'*'
,
'etc'
,
'monitor.conf'
))
self
.
assertEqual
(
2
,
len
(
monitor_conf_list
))
expected
=
[(
False
,
q
)
for
q
in
monitor_conf_list
]
got
=
[(
'!py!'
in
open
(
q
).
read
(),
q
)
for
q
in
monitor_conf_list
]
# check that no monitor.conf in generated configuratio has magic !py!
self
.
assertEqual
(
expected
,
got
)
def
test_empty
(
self
):
def
test_empty
(
self
):
parameter_dict
=
self
.
parseSlaveParameterDict
(
'empty'
)
parameter_dict
=
self
.
parseSlaveParameterDict
(
'empty'
)
self
.
assertLogAccessUrlWithPop
(
parameter_dict
)
self
.
assertLogAccessUrlWithPop
(
parameter_dict
)
...
...
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