-
-
Notifications
You must be signed in to change notification settings - Fork 816
Make ChannelsLiveServerTestCase compatible with Django 5.2 (#2148) #2160
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
Closed
dee077
wants to merge
9
commits into
django:main
from
openwisp:issues/2148-ChannelsLiveServerTestCase-Django52-compatible
Closed
Changes from 5 commits
Commits
Show all changes
9 commits
Select commit
Hold shift + click to select a range
f5f231c
Make ChannelsLiveServerTestCase compatible with Django 5.2 (#2148)
dee077 613ecaf
Add backward compatiblity
dee077 7c90195
Cleaner fix insted of redundant if else logic
dee077 adf1ba2
Add sample project but pytest fails
dee077 7d3315d
Fix failing test suit and add chormedriver in ci
dee077 5dc7816
Minor space fixes
dee077 1814ed0
Add attribution to OpenWISP for SeleniumMixin
dee077 c1fa2ff
Used fix for ChannelsLiveServerTestCase from #2164 and cleaned confte…
dee077 203ff8f
Merge branch 'main' into issues/2148-ChannelsLiveServerTestCase-Djang…
nemesifier File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -44,6 +44,7 @@ tests = | |
| pytest | ||
| pytest-django | ||
| pytest-asyncio | ||
| selenium | ||
| daphne = | ||
| daphne>=4.0.0 | ||
|
|
||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Empty file.
Empty file.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,35 @@ | ||
| """ | ||
| ASGI config for sample_project project. | ||
|
|
||
| It exposes the ASGI callable as a module-level variable named ``application``. | ||
|
|
||
| For more information on this file, see | ||
| https://docs.djangoproject.com/en/5.2/howto/deployment/asgi/ | ||
| """ | ||
|
|
||
| from django.core.asgi import get_asgi_application | ||
| from django.urls import path | ||
|
|
||
| from channels.auth import AuthMiddlewareStack | ||
| from channels.routing import ProtocolTypeRouter, URLRouter | ||
| from channels.security.websocket import AllowedHostsOriginValidator | ||
| from tests.sample_project.sampleapp.consumers import LiveMessageConsumer | ||
|
|
||
| application = ProtocolTypeRouter( | ||
| { | ||
| "websocket": AllowedHostsOriginValidator( | ||
| AuthMiddlewareStack( | ||
| URLRouter( | ||
| [ | ||
| path( | ||
| "ws/message/", | ||
| LiveMessageConsumer.as_asgi(), | ||
| name="live_message_counter", | ||
| ), | ||
| ] | ||
| ) | ||
| ) | ||
| ), | ||
| "http": get_asgi_application(), | ||
| } | ||
| ) |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,138 @@ | ||
| """ | ||
| Django settings for sample_project project. | ||
|
|
||
| Generated by 'django-admin startproject' using Django 5.2. | ||
|
|
||
| For more information on this file, see | ||
| https://docs.djangoproject.com/en/5.2/topics/settings/ | ||
|
|
||
| For the full list of settings and their values, see | ||
| https://docs.djangoproject.com/en/5.2/ref/settings/ | ||
| """ | ||
|
|
||
| from pathlib import Path | ||
|
|
||
| # Build paths inside the project like this: BASE_DIR / 'subdir'. | ||
| BASE_DIR = Path(__file__).resolve().parent.parent | ||
|
|
||
|
|
||
| # Quick-start development settings - unsuitable for production | ||
| # See https://docs.djangoproject.com/en/5.2/howto/deployment/checklist/ | ||
|
|
||
| # SECURITY WARNING: keep the secret key used in production secret! | ||
| SECRET_KEY = "django-insecure-w%kkd-b39(9uvz68x!-9+xt=&9q&^j@#uc_&=g%-s@bcsz*qbu" | ||
|
|
||
| # SECURITY WARNING: don't run with debug turned on in production! | ||
| DEBUG = True | ||
|
|
||
| ALLOWED_HOSTS = [] | ||
|
|
||
|
|
||
| # Application definition | ||
|
|
||
| INSTALLED_APPS = [ | ||
| "daphne", | ||
| "django.contrib.admin", | ||
| "django.contrib.auth", | ||
| "django.contrib.contenttypes", | ||
| "django.contrib.sessions", | ||
| "django.contrib.messages", | ||
| "django.contrib.staticfiles", | ||
| "sampleapp", | ||
| "channels", | ||
| ] | ||
|
|
||
| MIDDLEWARE = [ | ||
| "django.middleware.security.SecurityMiddleware", | ||
| "django.contrib.sessions.middleware.SessionMiddleware", | ||
| "django.middleware.common.CommonMiddleware", | ||
| "django.middleware.csrf.CsrfViewMiddleware", | ||
| "django.contrib.auth.middleware.AuthenticationMiddleware", | ||
| "django.contrib.messages.middleware.MessageMiddleware", | ||
| "django.middleware.clickjacking.XFrameOptionsMiddleware", | ||
| ] | ||
|
|
||
| ROOT_URLCONF = "config.urls" | ||
|
|
||
| TEMPLATES = [ | ||
| { | ||
| "BACKEND": "django.template.backends.django.DjangoTemplates", | ||
| "DIRS": [], | ||
| "APP_DIRS": True, | ||
| "OPTIONS": { | ||
| "context_processors": [ | ||
| "django.template.context_processors.csrf", | ||
| "django.template.context_processors.request", | ||
| "django.contrib.auth.context_processors.auth", | ||
| "django.contrib.messages.context_processors.messages", | ||
| ], | ||
| }, | ||
| }, | ||
| ] | ||
|
|
||
| WSGI_APPLICATION = "config.wsgi.application" | ||
| ASGI_APPLICATION = "config.asgi.application" | ||
|
|
||
| CHANNEL_LAYERS = { | ||
| "default": { | ||
| "BACKEND": "channels.layers.InMemoryChannelLayer", | ||
| }, | ||
| } | ||
|
|
||
| # Database | ||
| # https://docs.djangoproject.com/en/5.2/ref/settings/#databases | ||
|
|
||
| DATABASES = { | ||
| "default": { | ||
| "ENGINE": "django.db.backends.sqlite3", | ||
| "NAME": BASE_DIR / "sampleapp/sampleapp.sqlite3", | ||
| "TEST": { | ||
| "NAME": BASE_DIR / "sampleapp/test_sampleapp.sqlite3", | ||
| }, | ||
| } | ||
| } | ||
|
|
||
|
|
||
| # Password validation | ||
| # https://docs.djangoproject.com/en/5.2/ref/settings/#auth-password-validators | ||
|
|
||
| AUTH_PASSWORD_VALIDATORS = [ | ||
| { | ||
| "NAME": ( | ||
| "django.contrib.auth.password_validation." | ||
| "UserAttributeSimilarityValidator" | ||
| ), | ||
| }, | ||
| { | ||
| "NAME": "django.contrib.auth.password_validation.MinimumLengthValidator", | ||
| }, | ||
| { | ||
| "NAME": "django.contrib.auth.password_validation.CommonPasswordValidator", | ||
| }, | ||
| { | ||
| "NAME": "django.contrib.auth.password_validation.NumericPasswordValidator", | ||
| }, | ||
| ] | ||
|
|
||
|
|
||
| # Internationalization | ||
| # https://docs.djangoproject.com/en/5.2/topics/i18n/ | ||
|
|
||
| LANGUAGE_CODE = "en-us" | ||
|
|
||
| TIME_ZONE = "UTC" | ||
|
|
||
| USE_I18N = True | ||
|
|
||
| USE_TZ = True | ||
|
|
||
|
|
||
| # Static files (CSS, JavaScript, Images) | ||
| # https://docs.djangoproject.com/en/5.2/howto/static-files/ | ||
|
|
||
| STATIC_URL = "static/" | ||
|
|
||
| # Default primary key field type | ||
| # https://docs.djangoproject.com/en/5.2/ref/settings/#default-auto-field | ||
|
|
||
| DEFAULT_AUTO_FIELD = "django.db.models.BigAutoField" |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,31 @@ | ||
| """ | ||
| URL configuration for sample_project project. | ||
|
|
||
| The `urlpatterns` list routes URLs to views. For more information please see: | ||
| https://docs.djangoproject.com/en/5.2/topics/http/urls/ | ||
| Examples: | ||
| Function views | ||
| 1. Add an import: from my_app import views | ||
| 2. Add a URL to urlpatterns: path('', views.home, name='home') | ||
| Class-based views | ||
| 1. Add an import: from other_app.views import Home | ||
| 2. Add a URL to urlpatterns: path('', Home.as_view(), name='home') | ||
| Including another URLconf | ||
| 1. Import the include() function: from django.urls import include, path | ||
| 2. Add a URL to urlpatterns: path('blog/', include('blog.urls')) | ||
| """ | ||
|
|
||
| from django.conf import settings | ||
| from django.contrib import admin | ||
| from django.urls import path | ||
| from django.views.generic import RedirectView | ||
|
|
||
| urlpatterns = [ | ||
| path("admin/", admin.site.urls), | ||
| path( | ||
| "favicon.ico", | ||
| RedirectView.as_view( | ||
| url=settings.STATIC_URL + "sampleapp/images/django.svg", permanent=True | ||
| ), | ||
| ), | ||
| ] |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,16 @@ | ||
| """ | ||
| WSGI config for sample_project project. | ||
|
|
||
| It exposes the WSGI callable as a module-level variable named ``application``. | ||
|
|
||
| For more information on this file, see | ||
| https://docs.djangoproject.com/en/5.2/howto/deployment/wsgi/ | ||
| """ | ||
|
|
||
| import os | ||
|
|
||
| from django.core.wsgi import get_wsgi_application | ||
|
|
||
| os.environ.setdefault("DJANGO_SETTINGS_MODULE", "config.settings") | ||
|
|
||
| application = get_wsgi_application() |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,22 @@ | ||
| #!/usr/bin/env python | ||
| """Django's command-line utility for administrative tasks.""" | ||
| import os | ||
| import sys | ||
|
|
||
|
|
||
| def main(): | ||
| """Run administrative tasks.""" | ||
| os.environ.setdefault("DJANGO_SETTINGS_MODULE", "config.settings") | ||
| try: | ||
| from django.core.management import execute_from_command_line | ||
| except ImportError as exc: | ||
| raise ImportError( | ||
| "Couldn't import Django. Are you sure it's installed and " | ||
| "available on your PYTHONPATH environment variable? Did you " | ||
| "forget to activate a virtual environment?" | ||
| ) from exc | ||
| execute_from_command_line(sys.argv) | ||
|
|
||
|
|
||
| if __name__ == "__main__": | ||
| main() |
Empty file.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,9 @@ | ||
| from django.contrib import admin | ||
|
|
||
| from .models import Message | ||
|
|
||
|
|
||
| @admin.register(Message) | ||
| class MessageAdmin(admin.ModelAdmin): | ||
| list_display = ("title", "created") | ||
| change_list_template = "admin/sampleapp/message/change_list.html" |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| from django.apps import AppConfig | ||
|
|
||
|
|
||
| class SampleappConfig(AppConfig): | ||
| default_auto_field = "django.db.models.BigAutoField" | ||
| name = "tests.sample_project.sampleapp" |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
it might would be cleaner to just load the tests.sample_project.settings instead.
e.g.