Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
E
envsetup
Manage
Activity
Members
Plan
Redmine
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Container Registry
Model registry
Analyze
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
mediaserver
envsetup
Commits
e5883735
Commit
e5883735
authored
7 years ago
by
Stéphane Diemer
Browse files
Options
Downloads
Patches
Plain Diff
Fixed warnings type in nginx vhost test.
parent
95544c63
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
tests/test_nginx_vhosts.py
+3
-3
3 additions, 3 deletions
tests/test_nginx_vhosts.py
with
3 additions
and
3 deletions
tests/test_nginx_vhosts.py
+
3
−
3
View file @
e5883735
...
...
@@ -49,7 +49,7 @@ if os.path.exists('/etc/celerity/config.py'):
resolution_ignored
=
conf
.
get
(
'
TESTER_VHOST_RESOLUTION_IGNORED
'
,
''
).
split
(
'
,
'
)
found
=
False
errors
=
0
warnings
=
False
warnings
=
0
for
name
in
os
.
listdir
(
nginx_dir
):
path
=
os
.
path
.
join
(
nginx_dir
,
name
)
with
open
(
path
,
'
r
'
)
as
fo
:
...
...
@@ -71,7 +71,7 @@ for name in os.listdir(nginx_dir):
sys
.
stdout
.
write
(
'
Testing url
"
%s
"
:
\n
'
%
url
)
if
name
.
startswith
(
'
mediaserver
'
)
and
url
not
in
celerity_conf
:
sys
.
stdout
.
write
(
'
Url
"
%s
"
not found in celerity conf; it should also be set in the MediaWorker.
\n
'
%
url
)
warnings
=
True
warnings
+
=
1
# test domain IP
ip_error
=
None
ip_warning
=
None
...
...
@@ -128,7 +128,7 @@ for name in os.listdir(nginx_dir):
sys
.
stdout
.
write
(
'
.
\n
'
)
if
ip_warning
:
warnings
+=
1
warnings
+=
1
if
ip_error
or
req_error
:
errors
+=
1
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment