Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
N
neoppod
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
Vincent Pelletier
neoppod
Commits
de0feb4e
Commit
de0feb4e
authored
Mar 30, 2021
by
Julien Muchembled
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
qa: more Importer tests
parent
34d0725e
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
59 additions
and
8 deletions
+59
-8
neo/tests/functional/__init__.py
neo/tests/functional/__init__.py
+2
-2
neo/tests/zodb/__init__.py
neo/tests/zodb/__init__.py
+3
-1
neo/tests/zodb/testZODB.py
neo/tests/zodb/testZODB.py
+54
-5
No files found.
neo/tests/functional/__init__.py
View file @
de0feb4e
...
@@ -476,7 +476,7 @@ class NEOCluster(object):
...
@@ -476,7 +476,7 @@ class NEOCluster(object):
return
True
,
None
return
True
,
None
self
.
expectCondition
(
start
)
self
.
expectCondition
(
start
)
def
stop
(
self
,
clients
=
True
):
def
stop
(
self
,
clients
=
True
,
ignore_errors
=
False
):
# Suspend all processes to kill before actually killing them, so that
# Suspend all processes to kill before actually killing them, so that
# nodes don't log errors because they get disconnected from other nodes:
# nodes don't log errors because they get disconnected from other nodes:
# otherwise, storage nodes would often flush MB of logs just because we
# otherwise, storage nodes would often flush MB of logs just because we
...
@@ -503,7 +503,7 @@ class NEOCluster(object):
...
@@ -503,7 +503,7 @@ class NEOCluster(object):
zodb_storage
.
close
()
zodb_storage
.
close
()
self
.
zodb_storage_list
=
[]
self
.
zodb_storage_list
=
[]
time
.
sleep
(
0.5
)
time
.
sleep
(
0.5
)
if
error_list
:
if
error_list
and
not
ignore_errors
:
raise
NodeProcessError
(
'
\
n
'
.
join
(
error_list
))
raise
NodeProcessError
(
'
\
n
'
.
join
(
error_list
))
def
waitAll
(
self
):
def
waitAll
(
self
):
...
...
neo/tests/zodb/__init__.py
View file @
de0feb4e
...
@@ -46,16 +46,18 @@ class ZODBTestCase(TestCase):
...
@@ -46,16 +46,18 @@ class ZODBTestCase(TestCase):
super
(
ZODBTestCase
,
self
).
__init__
(
methodName
)
super
(
ZODBTestCase
,
self
).
__init__
(
methodName
)
test
=
getattr
(
self
,
methodName
).
__func__
test
=
getattr
(
self
,
methodName
).
__func__
def
runTest
():
def
runTest
():
failed
=
True
try
:
try
:
self
.
neo
.
start
()
self
.
neo
.
start
()
self
.
open
()
self
.
open
()
test
(
self
)
test
(
self
)
if
not
functional
:
if
not
functional
:
orphan
=
self
.
neo
.
storage
.
dm
.
getOrphanList
()
orphan
=
self
.
neo
.
storage
.
dm
.
getOrphanList
()
failed
=
False
finally
:
finally
:
self
.
close
()
self
.
close
()
if
functional
:
if
functional
:
self
.
neo
.
stop
()
self
.
neo
.
stop
(
ignore_errors
=
failed
)
else
:
else
:
self
.
neo
.
stop
(
None
)
self
.
neo
.
stop
(
None
)
if
functional
:
if
functional
:
...
...
neo/tests/zodb/testZODB.py
View file @
de0feb4e
...
@@ -14,17 +14,66 @@
...
@@ -14,17 +14,66 @@
# You should have received a copy of the GNU General Public License
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
# along with this program. If not, see <http://www.gnu.org/licenses/>.
import
unittest
import
os
,
unittest
from
functools
import
partial
,
wraps
from
ZODB.DB
import
DB
from
ZODB.FileStorage
import
FileStorage
from
ZODB.tests
import
testZODB
from
ZODB.tests
import
testZODB
import
ZODB
from
neo.storage
import
database
as
database_module
from
neo.storage.database.importer
import
ImporterDatabaseManager
from
..
import
expectedFailure
,
getTempDirectory
,
Patch
from
.
import
ZODBTestCase
from
.
import
ZODBTestCase
class
NEOZODBTests
(
ZODBTestCase
,
testZODB
.
ZODBTests
):
class
NEOZODBTests
(
ZODBTestCase
,
testZODB
.
ZODBTests
):
def
open
(
self
):
def
open
(
self
):
self
.
_open
(
_db
=
ZODB
.
DB
(
self
.
neo
.
getZODBStorage
()))
self
.
_open
(
_db
=
DB
(
self
.
neo
.
getZODBStorage
()))
class
DummyImporter
(
ImporterDatabaseManager
):
compress
=
True
def
__init__
(
self
,
zodb
,
getAdapterKlass
,
name
,
database
,
engine
=
None
,
wait
=
None
):
self
.
_conf
=
conf
=
{
'adapter'
:
name
,
'database'
:
database
,
'engine'
:
engine
,
'wait'
:
wait
,
}
self
.
zodb
=
zodb
with
Patch
(
database_module
,
getAdapterKlass
=
lambda
orig
,
name
:
getAdapterKlass
(
name
)):
super
(
DummyImporter
,
self
).
__init__
(
None
)
_parse
=
startJobs
=
lambda
*
args
,
**
kw
:
None
class
NEOZODBImporterTests
(
NEOZODBTests
):
@
classmethod
def
setUpClass
(
cls
):
super
(
NEOZODBImporterTests
,
cls
).
setUpClass
()
path
=
os
.
path
.
join
(
getTempDirectory
(),
"%s.%s.fs"
%
(
cls
.
__module__
,
cls
.
__name__
))
DB
(
FileStorage
(
path
)).
close
()
cls
.
_importer_config
=
(
'root'
,
{
'storage'
:
"""<filestorage>
path %s
</filestorage>"""
%
path
}),
def
run
(
self
,
*
args
,
**
kw
):
with
Patch
(
database_module
,
getAdapterKlass
=
lambda
*
args
:
partial
(
DummyImporter
,
self
.
_importer_config
,
*
args
)):
super
(
ZODBTestCase
,
self
).
run
(
*
args
,
**
kw
)
checkMultipleUndoInOneTransaction
=
expectedFailure
(
IndexError
)(
NEOZODBTests
.
checkMultipleUndoInOneTransaction
)
if
__name__
==
"__main__"
:
if
__name__
==
"__main__"
:
suite
=
unittest
.
makeSuite
(
NEOZODBTests
,
'check'
)
suite
=
unittest
.
TestSuite
((
unittest
.
makeSuite
(
NEOZODBTests
,
'check'
),
unittest
.
makeSuite
(
NEOZODBImporterTests
,
'check'
),
))
unittest
.
main
(
defaultTest
=
'suite'
)
unittest
.
main
(
defaultTest
=
'suite'
)
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