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
Levin Zimmermann
neoppod
Commits
6f6d071d
Commit
6f6d071d
authored
Aug 31, 2015
by
Julien Muchembled
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Simplify setup of monkey-patches in threaded tests
parent
3e1ed6a4
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
29 additions
and
31 deletions
+29
-31
neo/tests/__init__.py
neo/tests/__init__.py
+8
-4
neo/tests/threaded/__init__.py
neo/tests/threaded/__init__.py
+21
-27
No files found.
neo/tests/__init__.py
View file @
6f6d071d
...
@@ -519,11 +519,15 @@ class Patch(object):
...
@@ -519,11 +519,15 @@ class Patch(object):
def
__init__
(
self
,
patched
,
**
patch
):
def
__init__
(
self
,
patched
,
**
patch
):
(
name
,
patch
),
=
patch
.
iteritems
()
(
name
,
patch
),
=
patch
.
iteritems
()
wrapped
=
getattr
(
patched
,
name
)
wrapper
=
lambda
*
args
,
**
kw
:
patch
(
wrapped
,
*
args
,
**
kw
)
self
.
_patched
=
patched
self
.
_patched
=
patched
self
.
_name
=
name
self
.
_name
=
name
self
.
_wrapper
=
wraps
(
wrapped
)(
wrapper
)
if
callable
(
patch
):
wrapped
=
getattr
(
patched
,
name
,
None
)
func
=
patch
patch
=
lambda
*
args
,
**
kw
:
func
(
wrapped
,
*
args
,
**
kw
)
if
callable
(
wrapped
):
patch
=
wraps
(
wrapped
)(
patch
)
self
.
_patch
=
patch
try
:
try
:
orig
=
patched
.
__dict__
[
name
]
orig
=
patched
.
__dict__
[
name
]
self
.
_revert
=
lambda
:
setattr
(
patched
,
name
,
orig
)
self
.
_revert
=
lambda
:
setattr
(
patched
,
name
,
orig
)
...
@@ -532,7 +536,7 @@ class Patch(object):
...
@@ -532,7 +536,7 @@ class Patch(object):
def
apply
(
self
):
def
apply
(
self
):
assert
not
self
.
applied
assert
not
self
.
applied
setattr
(
self
.
_patched
,
self
.
_name
,
self
.
_
wrapper
)
setattr
(
self
.
_patched
,
self
.
_name
,
self
.
_
patch
)
self
.
applied
=
True
self
.
applied
=
True
def
revert
(
self
):
def
revert
(
self
):
...
...
neo/tests/threaded/__init__.py
View file @
6f6d071d
...
@@ -504,11 +504,23 @@ class ConnectionFilter(object):
...
@@ -504,11 +504,23 @@ class ConnectionFilter(object):
class
NEOCluster
(
object
):
class
NEOCluster
(
object
):
BaseConnection_getTimeout
=
staticmethod
(
BaseConnection
.
getTimeout
)
def
__init__
(
orig
,
self
):
# temporary definition for SimpleQueue patch
CONNECT_LIMIT
=
SocketConnector
.
CONNECT_LIMIT
orig
(
self
)
SimpleQueue__init__
=
staticmethod
(
SimpleQueue
.
__init__
)
lock
=
self
.
_lock
SocketConnector_bind
=
staticmethod
(
SocketConnector
.
_bind
)
def
_lock
(
blocking
=
True
):
SocketConnector_connect
=
staticmethod
(
SocketConnector
.
_connect
)
if
blocking
:
while
not
lock
(
False
):
Serialized
.
tic
(
step
=
1
)
return
True
return
lock
(
False
)
self
.
_lock
=
_lock
_patches
=
(
Patch
(
BaseConnection
,
getTimeout
=
lambda
orig
,
self
:
None
),
Patch
(
SimpleQueue
,
__init__
=
__init__
),
Patch
(
SocketConnector
,
CONNECT_LIMIT
=
0
),
Patch
(
SocketConnector
,
_bind
=
lambda
orig
,
self
,
addr
:
orig
(
self
,
BIND
)),
Patch
(
SocketConnector
,
_connect
=
lambda
orig
,
self
,
addr
:
orig
(
self
,
ServerNode
.
resolv
(
addr
))))
_patch_count
=
0
_patch_count
=
0
_resource_dict
=
weakref
.
WeakValueDictionary
()
_resource_dict
=
weakref
.
WeakValueDictionary
()
...
@@ -525,23 +537,8 @@ class NEOCluster(object):
...
@@ -525,23 +537,8 @@ class NEOCluster(object):
cls
.
_patch_count
+=
1
cls
.
_patch_count
+=
1
if
cls
.
_patch_count
>
1
:
if
cls
.
_patch_count
>
1
:
return
return
def
__init__
(
self
):
for
patch
in
cls
.
_patches
:
cls
.
SimpleQueue__init__
(
self
)
patch
.
apply
()
lock
=
self
.
_lock
def
_lock
(
blocking
=
True
):
if
blocking
:
while
not
lock
(
False
):
Serialized
.
tic
(
step
=
1
)
return
True
return
lock
(
False
)
self
.
_lock
=
_lock
BaseConnection
.
getTimeout
=
lambda
self
:
None
SimpleQueue
.
__init__
=
__init__
SocketConnector
.
CONNECT_LIMIT
=
0
SocketConnector
.
_bind
=
lambda
self
,
addr
:
\
cls
.
SocketConnector_bind
(
self
,
BIND
)
SocketConnector
.
_connect
=
lambda
self
,
addr
:
\
cls
.
SocketConnector_connect
(
self
,
ServerNode
.
resolv
(
addr
))
Serialized
.
init
()
Serialized
.
init
()
@
staticmethod
@
staticmethod
...
@@ -551,11 +548,8 @@ class NEOCluster(object):
...
@@ -551,11 +548,8 @@ class NEOCluster(object):
cls
.
_patch_count
-=
1
cls
.
_patch_count
-=
1
if
cls
.
_patch_count
:
if
cls
.
_patch_count
:
return
return
BaseConnection
.
getTimeout
=
cls
.
BaseConnection_getTimeout
for
patch
in
cls
.
_patches
:
SimpleQueue
.
__init__
=
cls
.
SimpleQueue__init__
patch
.
revert
()
SocketConnector
.
CONNECT_LIMIT
=
cls
.
CONNECT_LIMIT
SocketConnector
.
_bind
=
cls
.
SocketConnector_bind
SocketConnector
.
_connect
=
cls
.
SocketConnector_connect
Serialized
.
stop
()
Serialized
.
stop
()
def
__init__
(
self
,
master_count
=
1
,
partitions
=
1
,
replicas
=
0
,
upstream
=
None
,
def
__init__
(
self
,
master_count
=
1
,
partitions
=
1
,
replicas
=
0
,
upstream
=
None
,
...
...
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