Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
erp5
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Labels
Merge Requests
137
Merge Requests
137
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
Jobs
Commits
Open sidebar
nexedi
erp5
Commits
304d7a28
Commit
304d7a28
authored
Aug 28, 2018
by
Jérome Perrin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
runUnitTest: new zserver_frontend_url to run zelenium tests behind http proxy
parent
f103ae49
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
18 additions
and
2 deletions
+18
-2
product/ERP5Type/tests/ERP5TypeFunctionalTestCase.py
product/ERP5Type/tests/ERP5TypeFunctionalTestCase.py
+11
-2
product/ERP5Type/tests/runUnitTest.py
product/ERP5Type/tests/runUnitTest.py
+7
-0
No files found.
product/ERP5Type/tests/ERP5TypeFunctionalTestCase.py
View file @
304d7a28
...
@@ -138,8 +138,17 @@ class FunctionalTestRunner:
...
@@ -138,8 +138,17 @@ class FunctionalTestRunner:
return
self
.
portal
.
portal_tests
.
TestTool_getResults
(
self
.
run_only
)
return
self
.
portal
.
portal_tests
.
TestTool_getResults
(
self
.
run_only
)
def
_getTestURL
(
self
):
def
_getTestURL
(
self
):
return
ZELENIUM_BASE_URL
%
(
self
.
portal
.
portal_url
(),
self
.
run_only
,
# Access the https proxy in front of runUnitTest's zserver
self
.
user
,
self
.
password
)
base_url
=
os
.
getenv
(
'zserver_frontend_url'
)
if
base_url
:
base_url
=
'%s%s'
%
(
base_url
,
self
.
portal
.
getId
())
else
:
base_url
=
self
.
portal
.
portal_url
()
return
ZELENIUM_BASE_URL
%
(
base_url
,
self
.
run_only
,
self
.
user
,
self
.
password
)
def
test
(
self
,
debug
=
0
):
def
test
(
self
,
debug
=
0
):
xvfb
=
Xvfb
(
self
.
instance_home
)
xvfb
=
Xvfb
(
self
.
instance_home
)
...
...
product/ERP5Type/tests/runUnitTest.py
View file @
304d7a28
...
@@ -148,6 +148,10 @@ Options:
...
@@ -148,6 +148,10 @@ Options:
- HOST in this case a free port will be assigned
- HOST in this case a free port will be assigned
If used with --activity_node=, this can be a
If used with --activity_node=, this can be a
comma-separated list of addresses.
comma-separated list of addresses.
--zserver_frontend_url=STRING
URL of an http proxy where the zserver is reachable.
When running zelenium tests, the zserver will be
accessed from this URL.
--neo_storage Use a NEO storage (SQLite) instead of FileStorage.
--neo_storage Use a NEO storage (SQLite) instead of FileStorage.
--products_path=path,path Comma-separated list of products paths locations
--products_path=path,path Comma-separated list of products paths locations
which shall be used in test environment.
which shall be used in test environment.
...
@@ -730,6 +734,7 @@ def main(argument_list=None):
...
@@ -730,6 +734,7 @@ def main(argument_list=None):
"zeo_client="
,
"zeo_client="
,
"zeo_server="
,
"zeo_server="
,
"zserver="
,
"zserver="
,
"zserver_frontend_url="
,
"neo_storage"
,
"neo_storage"
,
"products_path="
,
"products_path="
,
"sys_path="
,
"sys_path="
,
...
@@ -842,6 +847,8 @@ def main(argument_list=None):
...
@@ -842,6 +847,8 @@ def main(argument_list=None):
os
.
environ
[
"zeo_server"
]
=
arg
os
.
environ
[
"zeo_server"
]
=
arg
elif
opt
==
"--zserver"
:
elif
opt
==
"--zserver"
:
os
.
environ
[
"zserver"
]
=
arg
os
.
environ
[
"zserver"
]
=
arg
elif
opt
==
"--zserver_frontend_url"
:
os
.
environ
[
"zserver_frontend_url"
]
=
arg
elif
opt
==
"--neo_storage"
:
elif
opt
==
"--neo_storage"
:
os
.
environ
[
"neo_storage"
]
=
""
os
.
environ
[
"neo_storage"
]
=
""
elif
opt
==
"--products_path"
:
elif
opt
==
"--products_path"
:
...
...
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