Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
erp5-Boxiang
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
Hamza
erp5-Boxiang
Commits
868b60f2
Commit
868b60f2
authored
May 21, 2018
by
Xiaowu Zhang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ERP5TypeTestCase: conversion server url is in list format
parent
71441e21
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
6 deletions
+6
-6
product/ERP5Type/tests/ERP5TypeTestCase.py
product/ERP5Type/tests/ERP5TypeTestCase.py
+6
-6
No files found.
product/ERP5Type/tests/ERP5TypeTestCase.py
View file @
868b60f2
...
@@ -129,7 +129,7 @@ def _getConnectionStringDict():
...
@@ -129,7 +129,7 @@ def _getConnectionStringDict():
os
.
environ
.
get
(
connection
,
'-'
+
connection_string
)
os
.
environ
.
get
(
connection
,
'-'
+
connection_string
)
return
connection_string_dict
return
connection_string_dict
def
_getConversionServerUrl
():
def
_getConversionServerUrl
List
():
""" Return the url for Conversion Server (Cloudooo)
""" Return the url for Conversion Server (Cloudooo)
"""
"""
url
=
os
.
environ
.
get
(
'conversion_server_url'
)
url
=
os
.
environ
.
get
(
'conversion_server_url'
)
...
@@ -139,7 +139,7 @@ def _getConversionServerUrl():
...
@@ -139,7 +139,7 @@ def _getConversionServerUrl():
os
.
environ
.
get
(
'conversion_server_port'
,
8008
))
os
.
environ
.
get
(
'conversion_server_port'
,
8008
))
warn
(
'conversion_server_hostname/conversion_server_port are deprecated.
\
n
'
warn
(
'conversion_server_hostname/conversion_server_port are deprecated.
\
n
'
'Using %s as conversion_server_url instead'
%
url
,
DeprecationWarning
)
'Using %s as conversion_server_url instead'
%
url
,
DeprecationWarning
)
return
url
return
url
.
split
(
','
)
def
_getConversionServerRetryCount
():
def
_getConversionServerRetryCount
():
""" Return retry count for Conversion Server (Cloudooo)
""" Return retry count for Conversion Server (Cloudooo)
...
@@ -167,11 +167,11 @@ def _createTestPromiseConfigurationFile(promise_path, bt5_repository_path_list=N
...
@@ -167,11 +167,11 @@ def _createTestPromiseConfigurationFile(promise_path, bt5_repository_path_list=N
_getPersistentMemcachedServerDict
()
_getPersistentMemcachedServerDict
()
memcached_url
=
"memcached://%(hostname)s:%(port)s/"
%
\
memcached_url
=
"memcached://%(hostname)s:%(port)s/"
%
\
_getVolatileMemcachedServerDict
()
_getVolatileMemcachedServerDict
()
cloudooo_url
=
_getConversionServerUrl
()
cloudooo_url
_list
=
_getConversionServerUrlList
()
promise_config
=
ConfigParser
.
RawConfigParser
()
promise_config
=
ConfigParser
.
RawConfigParser
()
promise_config
.
add_section
(
'external_service'
)
promise_config
.
add_section
(
'external_service'
)
promise_config
.
set
(
'external_service'
,
'cloudooo_url
'
,
cloudooo_url
)
promise_config
.
set
(
'external_service'
,
'cloudooo_url
_list'
,
cloudooo_url_list
)
promise_config
.
set
(
'external_service'
,
'memcached_url'
,
memcached_url
)
promise_config
.
set
(
'external_service'
,
'memcached_url'
,
memcached_url
)
promise_config
.
set
(
'external_service'
,
'kumofs_url'
,
kumofs_url
)
promise_config
.
set
(
'external_service'
,
'kumofs_url'
,
kumofs_url
)
...
@@ -968,9 +968,9 @@ class ERP5TypeCommandLineTestCase(ERP5TypeTestCaseMixin):
...
@@ -968,9 +968,9 @@ class ERP5TypeCommandLineTestCase(ERP5TypeTestCaseMixin):
def
_updateConversionServerConfiguration
(
self
):
def
_updateConversionServerConfiguration
(
self
):
"""Update conversion server (Cloudooo) at default site preferences.
"""Update conversion server (Cloudooo) at default site preferences.
"""
"""
url
=
_getConversionServerUrl
()
url
_list
=
_getConversionServerUrlList
()
pref
=
self
.
getDefaultSystemPreference
()
pref
=
self
.
getDefaultSystemPreference
()
pref
.
_setPreferredDocumentConversionServerUrl
(
url
)
pref
.
_setPreferredDocumentConversionServerUrl
List
(
url_list
)
# set default retry count in test for network issue
# set default retry count in test for network issue
retry_count
=
_getConversionServerRetryCount
()
retry_count
=
_getConversionServerRetryCount
()
pref
.
_setPreferredDocumentConversionServerRetry
(
retry_count
)
pref
.
_setPreferredDocumentConversionServerRetry
(
retry_count
)
...
...
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