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
Laurent S
erp5
Commits
5d264533
Commit
5d264533
authored
Jan 25, 2013
by
Julien Muchembled
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix testArchive & testERP5Catalog on Zope 2.13
parent
70b4842c
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
14 additions
and
15 deletions
+14
-15
product/ERP5Catalog/tests/testArchive.py
product/ERP5Catalog/tests/testArchive.py
+6
-8
product/ERP5Catalog/tests/testERP5Catalog.py
product/ERP5Catalog/tests/testERP5Catalog.py
+8
-7
No files found.
product/ERP5Catalog/tests/testArchive.py
View file @
5d264533
...
...
@@ -167,29 +167,27 @@ class TestArchive(InventoryAPITestCase):
self
.
checkRelativeUrlInSQLPathList
(
path_list
,
connection_id
=
self
.
original_connection_id
)
# Create new connectors for destination
addSQLConnection
=
portal
.
manage_addProduct
[
'ZMySQLDA'
]
\
.
manage_addZMySQLConnection
self
.
new_connection_id
=
'erp5_sql_connection1'
db1
,
db2
=
getExtraSqlConnectionStringList
()[:
2
]
portal
.
manage_addZMySQLConnection
(
self
.
new_connection_id
,
''
,
db1
)
addSQLConnection
(
self
.
new_connection_id
,
''
,
db1
)
new_connection
=
portal
[
self
.
new_connection_id
]
new_connection
.
manage_open_connection
()
# the deferred one
self
.
new_deferred_connection_id
=
'erp5_sql_connection2'
portal
.
manage_addZMySQLConnection
(
self
.
new_deferred_connection_id
,
''
,
db1
)
addSQLConnection
(
self
.
new_deferred_connection_id
,
''
,
db1
)
new_deferred_connection
=
portal
[
self
.
new_deferred_connection_id
]
new_deferred_connection
.
manage_open_connection
()
# Create new connectors for archive
self
.
archive_connection_id
=
'erp5_sql_connection3'
portal
.
manage_addZMySQLConnection
(
self
.
archive_connection_id
,
''
,
db2
)
addSQLConnection
(
self
.
archive_connection_id
,
''
,
db2
)
archive_connection
=
portal
[
self
.
archive_connection_id
]
archive_connection
.
manage_open_connection
()
# the deferred one
self
.
archive_deferred_connection_id
=
'erp5_sql_connection4'
portal
.
manage_addZMySQLConnection
(
self
.
archive_deferred_connection_id
,
''
,
db2
)
addSQLConnection
(
self
.
archive_deferred_connection_id
,
''
,
db2
)
archive_deferred_connection
=
portal
[
self
.
archive_deferred_connection_id
]
archive_deferred_connection
.
manage_open_connection
()
...
...
product/ERP5Catalog/tests/testERP5Catalog.py
View file @
5d264533
...
...
@@ -1495,13 +1495,13 @@ class TestERP5Catalog(ERP5TypeTestCase, LogInterceptor):
title
=
"GreatTitle2"
)
# Flush message queue
self
.
tic
()
addSQLConnection
=
portal
.
manage_addProduct
[
'ZMySQLDA'
]
\
.
manage_addZMySQLConnection
# Create new connectors
portal
.
manage_addZMySQLConnection
(
self
.
new_connection_id
,
''
,
new_connection_string
)
addSQLConnection
(
self
.
new_connection_id
,
''
,
new_connection_string
)
new_connection
=
portal
[
self
.
new_connection_id
]
new_connection
.
manage_open_connection
()
portal
.
manage_addZMySQLConnection
(
self
.
new_deferred_connection_id
,
''
,
new_connection_string
)
addSQLConnection
(
self
.
new_deferred_connection_id
,
''
,
new_connection_string
)
new_connection
=
portal
[
self
.
new_deferred_connection_id
]
new_connection
.
manage_open_connection
()
# the transactionless connector must not be change because this one
...
...
@@ -1648,11 +1648,12 @@ class TestERP5Catalog(ERP5TypeTestCase, LogInterceptor):
LOG
(
'Testing... '
,
0
,
message
)
# Create new connectors
portal
.
manage_addZMySQLConnection
(
self
.
new_erp5_sql_connection
,
''
,
new_connection_string
)
addSQLConnection
=
portal
.
manage_addProduct
[
'ZMySQLDA'
]
\
.
manage_addZMySQLConnection
addSQLConnection
(
self
.
new_erp5_sql_connection
,
''
,
new_connection_string
)
new_connection
=
portal
[
self
.
new_erp5_sql_connection
]
new_connection
.
manage_open_connection
()
portal
.
manage_addZMy
SQLConnection
(
self
.
new_erp5_deferred_sql_connection
,
''
,
add
SQLConnection
(
self
.
new_erp5_deferred_sql_connection
,
''
,
new_connection_string
)
new_connection
=
portal
[
self
.
new_erp5_deferred_sql_connection
]
new_connection
.
manage_open_connection
()
...
...
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