[deps] Added "channels" and "channels-test" extra requires

Author: pandafy

Diff for: openwisp_network_topology/consumers.py

@@ -40,7 +40,6 @@ def connect(self):
 
     def disconnect(self, close_code):
         self.close()
-        pass
 
     def send_topology_update(self, event):
         self.send(

Diff for: openwisp_network_topology/tests/test_websockets.py

@@ -59,12 +59,10 @@ async def _assert_connection_org_manager(self, client, view_perm=True, conn=True
         )
         t = await database_sync_to_async(self._create_topology)(organization=org)
         if view_perm:
-            topology_view_permission = await database_sync_to_async(
-                Permission.objects.get
-            )(codename='view_topology')
-            await database_sync_to_async(test_user.user_permissions.add)(
-                topology_view_permission
+            topology_view_permission = await Permission.objects.aget(
+                codename='view_topology'
             )
+            await test_user.user_permissions.aadd(topology_view_permission)
         await database_sync_to_async(client.force_login)(test_user)
         communicator = await self._get_communicator(client, t.pk)
         connected, _ = await communicator.connect()
@@ -134,7 +132,7 @@ async def test_node_topology_update(self, admin_user, admin_client):
         response = await communicator.receive_json_from()
         assert response['topology'] is not None
         assert response['topology'] == expected_response
-        await database_sync_to_async(node.delete)()
+        await node.adelete()
         expected_response = await database_sync_to_async(topo.json)()
         response = await communicator.receive_json_from()
         assert response['topology'] is not None
@@ -164,12 +162,12 @@ async def test_link_topology_update(self, admin_user, admin_client):
         assert response['topology'] == expected_response
         link.status = 'down'
         await database_sync_to_async(link.full_clean)()
-        await database_sync_to_async(link.save)()
+        await link.asave()
         expected_response = await database_sync_to_async(topo.json)()
         response = await communicator.receive_json_from()
         assert response['topology'] is not None
         assert response['topology'] == expected_response
-        await database_sync_to_async(link.delete)()
+        await link.adelete()
         expected_response = await database_sync_to_async(topo.json)()
         response = await communicator.receive_json_from()
         assert response['topology'] is not None
@@ -184,7 +182,7 @@ async def test_topology_properties_update(self, admin_user, admin_client):
         assert connected is True
         topo.name = 'test'
         await database_sync_to_async(topo.full_clean)()
-        await database_sync_to_async(topo.save)()
+        await topo.asave()
         expected_response = await database_sync_to_async(topo.json)()
         response = await communicator.receive_json_from()
         assert response['topology'] is not None

Diff for: requirements-test.txt

@@ -1,10 +1,8 @@
 responses~=0.25.7
-pytest-asyncio~=0.24.0
-pytest-django~=4.10.0
 freezegun~=1.5.1
 # Needed to test integrations
 openwisp-monitoring @ https://github.com/openwisp/openwisp-monitoring/tarball/1.2
 openwisp-controller @ https://github.com/openwisp/openwisp-controller/tarball/1.2
-openwisp-utils[qa,selenium] @ https://github.com/openwisp/openwisp-utils/tarball/1.2
+openwisp-utils[qa,selenium,channels-test] @ https://github.com/openwisp/openwisp-utils/tarball/1.2
 redis~=5.2.1
 django_redis~=5.4.0

Diff for: requirements.txt

@@ -2,4 +2,4 @@ openwisp-users @ https://github.com/openwisp/openwisp-users/tarball/1.2
 netdiff @ https://github.com/openwisp/netdiff/tarball/1.2
 jsonfield~=3.1.0
 django-flat-json-widget~=0.3.1
-openwisp-utils[celery] @ https://github.com/openwisp/openwisp-utils/tarball/1.2
+openwisp-utils[celery,channels] @ https://github.com/openwisp/openwisp-utils/tarball/1.2

Diff for: tests/openwisp2/asgi.py

@@ -1,6 +1,7 @@
 from channels.auth import AuthMiddlewareStack
 from channels.routing import ProtocolTypeRouter, URLRouter
 from django.conf import settings
+from django.core.asgi import get_asgi_application
 
 if 'openwisp_controller.geo' in settings.INSTALLED_APPS:
     from openwisp_controller.routing import get_routes as get_controller_routes
@@ -27,5 +28,6 @@ def get_controller_routes():
                 + get_controller_routes()
             )
         ),
+        'http': get_asgi_application(),
     }
 )

Diff for: tests/openwisp2/settings.py

@@ -20,6 +20,7 @@
 SECRET_KEY = '@q4z-^s=mv59#o=uutv4*m=h@)ik4%zp1)-k^_(!_7*x_&+ze$'
 
 INSTALLED_APPS = [
+    'daphne',
     'django.contrib.auth',
     'django.contrib.contenttypes',
     'django.contrib.sessions',