Skip to content

Commit 7cd919c

Browse files
committed
fix tests for Python 3.8
1 parent 226396c commit 7cd919c

38 files changed

+85
-76
lines changed

tests/server/server.py

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,13 @@
1616
import sys
1717
import django
1818

19-
try:
20-
from sanic import Sanic
21-
Sanic._app_registry = {}
22-
# clear sanic registry
23-
except ImportError:
24-
pass
19+
if sys.version_info >= (3, 9):
20+
try:
21+
from sanic import Sanic
22+
Sanic._app_registry = {}
23+
# clear sanic registry
24+
except ImportError:
25+
pass
2526

2627

2728
class ServiceEnvironment(Env):
@@ -100,7 +101,7 @@ class ServiceEnvironment(Env):
100101
service.use(Preference(
101102
default_aborted_response_status=500,
102103
default_timeout_response_status=500,
103-
orm_on_conflict_type='error'
104+
orm_on_conflict_type='error' if sys.version_info >= (3, 9) else 'warn',
104105
))
105106
service.use(Time(
106107
use_tz=django.VERSION > (3, 2)

tests/test_1_orm/test_orm_schemas.py

Lines changed: 24 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
import pytest
33
from django.db import models
44
from tests.conftest import setup_service
5+
import sys
6+
57
#
68
setup_service(__name__, async_param=False)
79

@@ -46,31 +48,32 @@ class Article_(orm.Schema[Article]):
4648
not_exists: int = models.Count('not_exists')
4749
# not exists
4850

49-
def test_transform_fields(self):
50-
from app.models import User, Article
51+
if sys.version_info >= (3, 9):
52+
def test_transform_fields(self):
53+
from app.models import User, Article
5154

52-
class ArticleTestSchema(orm.Schema[Article]):
53-
created_year = orm.Field('created_at.year')
54-
first_tag: str = orm.Field('tags__0')
55+
class ArticleTestSchema(orm.Schema[Article]):
56+
created_year = orm.Field('created_at.year')
57+
first_tag: str = orm.Field('tags__0')
5558

56-
from utype.types import Year
57-
assert issubclass(ArticleTestSchema.__parser__.get_field('created_year').type, Year)
59+
from utype.types import Year
60+
assert issubclass(ArticleTestSchema.__parser__.get_field('created_year').type, Year)
5861

59-
class UserLatestSchema(orm.Schema[User]):
60-
latest_article_year: int = models.Max('contents__article__created_at__year')
62+
class UserLatestSchema(orm.Schema[User]):
63+
latest_article_year: int = models.Max('contents__article__created_at__year')
6164

62-
def test_lookup_fields(self):
63-
from app.models import User, Article
65+
def test_lookup_fields(self):
66+
from app.models import User, Article
6467

65-
with pytest.raises(TypeError):
66-
class ArticleTestSchema(orm.Schema[Article]):
67-
author_name: int = orm.Field('author.username')
68-
# invalid declaration
68+
with pytest.raises(TypeError):
69+
class ArticleTestSchema(orm.Schema[Article]):
70+
author_name: int = orm.Field('author.username')
71+
# invalid declaration
6972

70-
with pytest.raises(TypeError):
71-
class ArticleTestSchema2(orm.Schema[Article]):
72-
title: int
73-
# invalid declaration
73+
with pytest.raises(TypeError):
74+
class ArticleTestSchema2(orm.Schema[Article]):
75+
title: int
76+
# invalid declaration
7477

75-
class ArticleTestSchema3(orm.Schema[Article]):
76-
created_at: float # timestamp
78+
class ArticleTestSchema3(orm.Schema[Article]):
79+
created_at: float # timestamp

tests/test_3_api/test_api_sanic.py

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,20 @@
11
from tests.conftest import make_live_process, setup_service, make_live_thread
22
from .params import do_live_api_tests
3+
import sys
34

4-
setup_service(__name__, backend='sanic')
5-
sanic_server_process = make_live_process(backend='sanic', port=8004, cmdline=True)
6-
# sanic_server_thread = make_live_thread(backend='sanic', port=8084)
7-
from sanic import Sanic
8-
Sanic._app_registry = {}
5+
if sys.version_info >= (3, 9):
6+
setup_service(__name__, backend='sanic')
7+
sanic_server_process = make_live_process(backend='sanic', port=8004, cmdline=True)
8+
# sanic_server_thread = make_live_thread(backend='sanic', port=8084)
9+
from sanic import Sanic
10+
Sanic._app_registry = {}
911

1012

11-
def test_sanic_api(service, sanic_server_process):
12-
do_live_api_tests(service)
13-
service._application = None
14-
service.adaptor.app = None
15-
Sanic._app_registry = {}
13+
def test_sanic_api(service, sanic_server_process):
14+
do_live_api_tests(service)
15+
service._application = None
16+
service.adaptor.app = None
17+
Sanic._app_registry = {}
1618

17-
# def test_sanic_api_internal(service, sanic_server_thread):
18-
# do_live_api_tests(service)
19+
# def test_sanic_api_internal(service, sanic_server_thread):
20+
# do_live_api_tests(service)
File renamed without changes.

tests/test_7_ops/django_asgi_site/django_demo/__init__.py renamed to tests/test_5_ops/django_asgi_site/django_demo/__init__.py

File renamed without changes.
File renamed without changes.

tests/test_7_ops/django_asgi_site/django_demo/settings.py renamed to tests/test_5_ops/django_asgi_site/django_demo/settings.py

File renamed without changes.
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)