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
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
Carlos Ramos Carreño
erp5
Commits
bb7d064e
Commit
bb7d064e
authored
1 year ago
by
Kazuhiko Shiozaki
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixup! ERP5Site: add erp5_sql_isolated_connection.
parent
453cdf79
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
15 deletions
+2
-15
product/ERP5Type/tests/ERP5TypeTestCase.py
product/ERP5Type/tests/ERP5TypeTestCase.py
+1
-2
product/ERP5Type/tests/runUnitTest.py
product/ERP5Type/tests/runUnitTest.py
+1
-13
No files found.
product/ERP5Type/tests/ERP5TypeTestCase.py
View file @
bb7d064e
...
...
@@ -101,7 +101,6 @@ def _getConnectionStringDict():
connection_string_dict
=
{}
default
=
os
.
environ
.
get
(
'erp5_sql_connection_string'
)
for
connection
in
(
'erp5_sql_connection_string'
,
'erp5_sql_read_committed_connection_string'
,
'erp5_sql_deferred_connection_string'
,
# default value for transactionless is derived from value
# for cmf_activity, so process it last
...
...
@@ -112,7 +111,7 @@ def _getConnectionStringDict():
connection
=
'erp5_sql_transactionless_connection_string'
if
os
.
environ
.
get
(
connection
,
connection_string
):
connection_string_dict
[
connection
]
=
\
os
.
environ
.
get
(
connection
,
re
.
sub
(
r'((?:[%*][^ ]+ )*)(![^ ]+ )?(.+)'
,
r'\1-\3'
,
connection_string
)
)
os
.
environ
.
get
(
connection
,
'-'
+
connection_string
)
return
connection_string_dict
def
_getConversionServerUrlList
():
...
...
This diff is collapsed.
Click to expand it.
product/ERP5Type/tests/runUnitTest.py
View file @
bb7d064e
...
...
@@ -58,13 +58,10 @@ Options:
--erp5_sql_connection_string=STRING
ZSQL Connection string for erp5_sql_connection, by
default, it will use "test test"
--erp5_sql_read_committed_connection_string=STRING
ZSQL Connection string for erp5_sql_read_committed_connection
(if unset, defaults to erp5_sql_connection_string with "!READ-COMMITTED")
--cmf_activity_sql_connection_string=STRING
ZSQL Connection string for
cmf_activity_sql_connection (if unset, defaults to
erp5_sql_
read_committed_
connection_string)
erp5_sql_connection_string)
--extra_sql_connection_string_list=STRING
Used when 2 or more ZSQL connection strings are
needed. By defaut, it will take the last four
...
...
@@ -747,7 +744,6 @@ def main(argument_list=None):
"firefox_bin="
,
"xvfb_bin="
,
"recreate_catalog="
,
"erp5_sql_connection_string="
,
"erp5_sql_read_committed_connection_string="
,
"cmf_activity_sql_connection_string="
,
"extra_sql_connection_string_list="
,
"conversion_server_url="
,
...
...
@@ -828,8 +824,6 @@ def main(argument_list=None):
os
.
environ
[
"erp5_tests_recreate_catalog"
]
=
arg
elif
opt
==
"--erp5_sql_connection_string"
:
os
.
environ
[
"erp5_sql_connection_string"
]
=
arg
elif
opt
==
"--erp5_sql_read_committed_connection_string"
:
os
.
environ
[
"erp5_sql_read_committed_connection_string"
]
=
arg
elif
opt
==
"--cmf_activity_sql_connection_string"
:
os
.
environ
[
"cmf_activity_sql_connection_string"
]
=
arg
elif
opt
==
"--extra_sql_connection_string_list"
:
...
...
@@ -904,12 +898,6 @@ def main(argument_list=None):
elif
opt
==
"--with_wendelin_core"
:
os
.
environ
[
"with_wendelin_core"
]
=
"1"
if
"erp5_sql_read_committed_connection_string"
not
in
os
.
environ
and
"erp5_sql_connection_string"
in
os
.
environ
:
os
.
environ
[
"erp5_sql_read_committed_connection_string"
]
=
re
.
sub
(
r'((?:[%*][^ ]+ )*)(![^ ]+ )?(.+)'
,
r'\1!READ-COMMITTED \3'
,
os
.
environ
[
"erp5_sql_connection_string"
])
if
"cmf_activity_sql_connection_string"
not
in
os
.
environ
and
"erp5_sql_read_committed_connection_string"
in
os
.
environ
:
os
.
environ
[
"cmf_activity_sql_connection_string"
]
=
os
.
environ
[
"erp5_sql_read_committed_connection_string"
]
bt5_path_list
+=
filter
(
None
,
os
.
environ
.
get
(
"erp5_tests_bt5_path"
,
""
).
split
(
','
))
valid_path_list
=
[]
...
...
This diff is collapsed.
Click to expand it.
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