mirror of
				https://github.com/django/daphne.git
				synced 2025-11-04 01:27:33 +03:00 
			
		
		
		
	Remove consumer_finished from tests that flushed
No longer needed now messages aren't buffered outside consumers.
This commit is contained in:
		
							parent
							
								
									69c59ee8b4
								
							
						
					
					
						commit
						2ced4ee2e9
					
				| 
						 | 
					@ -6,7 +6,6 @@ from channels import route
 | 
				
			||||||
from channels.binding.base import CREATE, DELETE, UPDATE
 | 
					from channels.binding.base import CREATE, DELETE, UPDATE
 | 
				
			||||||
from channels.binding.websockets import WebsocketBinding
 | 
					from channels.binding.websockets import WebsocketBinding
 | 
				
			||||||
from channels.generic.websockets import WebsocketDemultiplexer
 | 
					from channels.generic.websockets import WebsocketDemultiplexer
 | 
				
			||||||
from channels.signals import consumer_finished
 | 
					 | 
				
			||||||
from channels.tests import ChannelTestCase, HttpClient, apply_routes
 | 
					from channels.tests import ChannelTestCase, HttpClient, apply_routes
 | 
				
			||||||
 | 
					
 | 
				
			||||||
User = get_user_model()
 | 
					User = get_user_model()
 | 
				
			||||||
| 
						 | 
					@ -33,7 +32,6 @@ class TestsBinding(ChannelTestCase):
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        user = User.objects.create(username='test', email='test@test.com')
 | 
					        user = User.objects.create(username='test', email='test@test.com')
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        consumer_finished.send(sender=None)
 | 
					 | 
				
			||||||
        received = client.receive()
 | 
					        received = client.receive()
 | 
				
			||||||
        self.assertTrue('payload' in received)
 | 
					        self.assertTrue('payload' in received)
 | 
				
			||||||
        self.assertTrue('action' in received['payload'])
 | 
					        self.assertTrue('action' in received['payload'])
 | 
				
			||||||
| 
						 | 
					@ -75,8 +73,6 @@ class TestsBinding(ChannelTestCase):
 | 
				
			||||||
            client.join_group('users_exclude')
 | 
					            client.join_group('users_exclude')
 | 
				
			||||||
 | 
					
 | 
				
			||||||
            user = User.objects.create(username='test', email='test@test.com')
 | 
					            user = User.objects.create(username='test', email='test@test.com')
 | 
				
			||||||
            consumer_finished.send(sender=None)
 | 
					 | 
				
			||||||
            consumer_finished.send(sender=None)
 | 
					 | 
				
			||||||
            received = client.receive()
 | 
					            received = client.receive()
 | 
				
			||||||
 | 
					
 | 
				
			||||||
            self.assertTrue('payload' in received)
 | 
					            self.assertTrue('payload' in received)
 | 
				
			||||||
| 
						 | 
					@ -131,7 +127,6 @@ class TestsBinding(ChannelTestCase):
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        # Make model and clear out pending sends
 | 
					        # Make model and clear out pending sends
 | 
				
			||||||
        user = User.objects.create(username='test', email='test@test.com')
 | 
					        user = User.objects.create(username='test', email='test@test.com')
 | 
				
			||||||
        consumer_finished.send(sender=None)
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
        client = HttpClient()
 | 
					        client = HttpClient()
 | 
				
			||||||
        client.join_group('users2')
 | 
					        client.join_group('users2')
 | 
				
			||||||
| 
						 | 
					@ -139,7 +134,6 @@ class TestsBinding(ChannelTestCase):
 | 
				
			||||||
        user.username = 'test_new'
 | 
					        user.username = 'test_new'
 | 
				
			||||||
        user.save()
 | 
					        user.save()
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        consumer_finished.send(sender=None)
 | 
					 | 
				
			||||||
        received = client.receive()
 | 
					        received = client.receive()
 | 
				
			||||||
        self.assertTrue('payload' in received)
 | 
					        self.assertTrue('payload' in received)
 | 
				
			||||||
        self.assertTrue('action' in received['payload'])
 | 
					        self.assertTrue('action' in received['payload'])
 | 
				
			||||||
| 
						 | 
					@ -178,14 +172,12 @@ class TestsBinding(ChannelTestCase):
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        # Make model and clear out pending sends
 | 
					        # Make model and clear out pending sends
 | 
				
			||||||
        user = User.objects.create(username='test', email='test@test.com')
 | 
					        user = User.objects.create(username='test', email='test@test.com')
 | 
				
			||||||
        consumer_finished.send(sender=None)
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
        client = HttpClient()
 | 
					        client = HttpClient()
 | 
				
			||||||
        client.join_group('users3')
 | 
					        client.join_group('users3')
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        user.delete()
 | 
					        user.delete()
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        consumer_finished.send(sender=None)
 | 
					 | 
				
			||||||
        received = client.receive()
 | 
					        received = client.receive()
 | 
				
			||||||
        self.assertTrue('payload' in received)
 | 
					        self.assertTrue('payload' in received)
 | 
				
			||||||
        self.assertTrue('action' in received['payload'])
 | 
					        self.assertTrue('action' in received['payload'])
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -9,7 +9,6 @@ from six import BytesIO
 | 
				
			||||||
 | 
					
 | 
				
			||||||
from channels import Channel
 | 
					from channels import Channel
 | 
				
			||||||
from channels.handler import AsgiHandler
 | 
					from channels.handler import AsgiHandler
 | 
				
			||||||
from channels.signals import consumer_finished
 | 
					 | 
				
			||||||
from channels.tests import ChannelTestCase
 | 
					from channels.tests import ChannelTestCase
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					@ -24,7 +23,6 @@ class FakeAsgiHandler(AsgiHandler):
 | 
				
			||||||
    def __init__(self, response):
 | 
					    def __init__(self, response):
 | 
				
			||||||
        assert isinstance(response, (HttpResponse, StreamingHttpResponse))
 | 
					        assert isinstance(response, (HttpResponse, StreamingHttpResponse))
 | 
				
			||||||
        self._response = response
 | 
					        self._response = response
 | 
				
			||||||
        consumer_finished.send(sender=self.__class__)
 | 
					 | 
				
			||||||
        super(FakeAsgiHandler, self).__init__()
 | 
					        super(FakeAsgiHandler, self).__init__()
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    def get_response(self, request):
 | 
					    def get_response(self, request):
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in New Issue
	
	Block a user