Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add support for nested context manager use #56

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add support for nested context manager use #56

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions multidb/pinning.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ def unpin_this_thread():


class UsePrimaryDB(object):
"""A contextmanager/decorator to use the master database."""
"""A contextmanager/decorator to use the primary database."""
def __call__(self, func):
@wraps(func)
def decorator(*args, **kw):
Expand All @@ -43,11 +43,12 @@ def decorator(*args, **kw):
return decorator

def __enter__(self):
_locals.old = this_thread_is_pinned()
_locals.old = getattr(_locals, 'old', [])
_locals.old.append(this_thread_is_pinned())
pin_this_thread()

def __exit__(self, type, value, tb):
if not _locals.old:
if not _locals.old.pop():
unpin_this_thread()


Expand Down
52 changes: 52 additions & 0 deletions multidb/tests.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,6 +202,22 @@ def check():
check()
assert not this_thread_is_pinned()

def test_decorator_nested(self):
@use_primary_db
def check_inner():
assert this_thread_is_pinned()

@use_primary_db
def check_outer():
assert this_thread_is_pinned()
check_inner()
assert this_thread_is_pinned()

unpin_this_thread()
assert not this_thread_is_pinned()
check_outer()
assert not this_thread_is_pinned()

def test_decorator_resets(self):
@use_primary_db
def check():
Expand All @@ -211,20 +227,56 @@ def check():
check()
assert this_thread_is_pinned()

def test_decorator_resets_nested(self):
@use_primary_db
def check_inner():
assert this_thread_is_pinned()

@use_primary_db
def check_outer():
assert this_thread_is_pinned()
check_inner()
assert this_thread_is_pinned()

pin_this_thread()
assert this_thread_is_pinned()
check_outer()
assert this_thread_is_pinned()

def test_context_manager(self):
unpin_this_thread()
assert not this_thread_is_pinned()
with use_primary_db:
assert this_thread_is_pinned()
assert not this_thread_is_pinned()

def test_context_manager_nested(self):
unpin_this_thread()
assert not this_thread_is_pinned()
with use_primary_db:
assert this_thread_is_pinned()
with use_primary_db:
assert this_thread_is_pinned()
assert this_thread_is_pinned()
assert not this_thread_is_pinned()

def test_context_manager_resets(self):
pin_this_thread()
assert this_thread_is_pinned()
with use_primary_db:
assert this_thread_is_pinned()
assert this_thread_is_pinned()

def test_context_manager_resets_nested(self):
pin_this_thread()
assert this_thread_is_pinned()
with use_primary_db:
assert this_thread_is_pinned()
with use_primary_db:
assert this_thread_is_pinned()
assert this_thread_is_pinned()
assert this_thread_is_pinned()

def test_context_manager_exception(self):
unpin_this_thread()
assert not this_thread_is_pinned()
Expand Down