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
03b1bc73
Commit
03b1bc73
authored
4 years ago
by
Nicolas KAROLAK
Browse files
Options
Downloads
Patches
Plain Diff
remove celerity tests not related to nginx
parent
cff11f99
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
tests/test_nginx_vhosts.py
+0
-12
0 additions, 12 deletions
tests/test_nginx_vhosts.py
with
0 additions
and
12 deletions
tests/test_nginx_vhosts.py
+
0
−
12
View file @
03b1bc73
...
@@ -84,7 +84,6 @@ def test_vhost(
...
@@ -84,7 +84,6 @@ def test_vhost(
ports_info
=
None
,
ports_info
=
None
,
domains
=
None
,
domains
=
None
,
resolution_ignored
=
None
,
resolution_ignored
=
None
,
celerity_conf
=
""
,
nginx_file
=
None
,
nginx_file
=
None
,
wowza_dir
=
None
,
wowza_dir
=
None
,
tested
=
0
,
tested
=
0
,
...
@@ -96,10 +95,6 @@ def test_vhost(
...
@@ -96,10 +95,6 @@ def test_vhost(
for
domain
in
domains
or
[
"
localhost
"
]:
for
domain
in
domains
or
[
"
localhost
"
]:
url
=
f
"
{
proto
}
://
{
domain
}
:
{
port
}
"
url
=
f
"
{
proto
}
://
{
domain
}
:
{
port
}
"
u
.
info
(
f
"
- testing url
'
{
url
}
'
from
{
name
}
"
)
u
.
info
(
f
"
- testing url
'
{
url
}
'
from
{
name
}
"
)
if
name
.
startswith
(
"
mediaserver
"
)
and
not
tested
:
if
not
re
.
search
(
r
"
https?://%s
"
%
domain
,
celerity_conf
):
u
.
warning
(
f
"
url
'
{
url
}
'
not found in celerity conf
"
)
warnings
+=
1
# test domain IP
# test domain IP
ip_error
=
None
ip_error
=
None
ip_warning
=
None
ip_warning
=
None
...
@@ -194,12 +189,6 @@ def main():
...
@@ -194,12 +189,6 @@ def main():
# get envsetup conf
# get envsetup conf
conf
=
u
.
load_conf
()
conf
=
u
.
load_conf
()
# get celerity conf
celerity_conf
=
""
if
Path
(
"
/etc/celerity/config.py
"
).
exists
():
with
open
(
"
/etc/celerity/config.py
"
,
"
r
"
)
as
fo
:
celerity_conf
=
fo
.
read
()
# get enabled vhosts
# get enabled vhosts
resolution_ignored
=
conf
.
get
(
"
TESTER_VHOST_RESOLUTION_IGNORED
"
,
""
).
split
(
"
,
"
)
resolution_ignored
=
conf
.
get
(
"
TESTER_VHOST_RESOLUTION_IGNORED
"
,
""
).
split
(
"
,
"
)
errors
=
0
errors
=
0
...
@@ -215,7 +204,6 @@ def main():
...
@@ -215,7 +204,6 @@ def main():
ports
,
ports
,
hostnames
,
hostnames
,
resolution_ignored
,
resolution_ignored
,
celerity_conf
,
nginx_conf
,
nginx_conf
,
wowza_dir
,
wowza_dir
,
tested
,
tested
,
...
...
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