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.

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

Fixed mute_signals restoring signals receiver order. #1043

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion factory/django.py
Original file line number Diff line number Diff line change
Expand Up @@ -311,7 +311,7 @@ def __exit__(self, exc_type, exc_value, traceback):
logger.debug('mute_signals: Restoring signal handlers %r',
receivers)

signal.receivers += receivers
signal.receivers = receivers + signal.receivers
with signal.lock:
# Django uses some caching for its signals.
# Since we're bypassing signal.connect and signal.disconnect,
Expand Down
16 changes: 16 additions & 0 deletions tests/test_django.py
Original file line number Diff line number Diff line change
Expand Up @@ -941,6 +941,22 @@ def test_receiver_created_during_model_instantiation_is_not_lost(self):

self.assertTrue(self.handlers.created_during_instantiation.called)

def test_signal_receiver_order_restored_after_mute_signals(self):
def must_be_first(*args, **kwargs):
self.handlers.do_stuff(1)

def must_be_second(*args, **kwargs):
self.handlers.do_stuff(2)

signals.post_save.connect(must_be_first)
with factory.django.mute_signals(signals.post_save):
WithSignalsFactory(post_save_signal_receiver=must_be_second)
self.assertEqual(self.handlers.do_stuff.call_args_list, [mock.call(2)])

self.handlers.reset_mock()
WithSignalsFactory(post_save_signal_receiver=must_be_second)
self.assertEqual(self.handlers.do_stuff.call_args_list, [mock.call(1), mock.call(2)])

def test_signal_cache(self):
with factory.django.mute_signals(signals.pre_save, signals.post_save):
signals.post_save.connect(self.handlers.mute_block_receiver)
Expand Down