Skip to content

Commit 0670c1a

Browse files
rednaksrednaks
committed
fix formatting for tests
1 parent 949f7ab commit 0670c1a

File tree

5 files changed

+91
-95
lines changed

5 files changed

+91
-95
lines changed

‎manage.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/usr/bin/env python
22
# -*- coding: utf-8 -*-
3-
from __future__ import unicode_literals, absolute_import
3+
from __future__ import absolute_import, unicode_literals
44

55
import os
66
import sys

‎tests/models.py‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,3 @@
88
class TestModel(models.Model):
99
name = models.CharField(max_length=50, null=True, blank=True)
1010
obj_type = models.CharField(max_length=50, null=True, blank=True)
11-
12-
13-

‎tests/settings.py‎

Lines changed: 19 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,51 +1,48 @@
11
"""Django settings."""
22
# -*- coding: utf-8
3-
from __future__ import unicode_literals, absolute_import
3+
from __future__ import absolute_import, unicode_literals
44

55
# import django
66

77
DEBUG = True
88
USE_TZ = True
99

1010
# SECURITY WARNING: keep the secret key used in production secret!
11-
SECRET_KEY = '-%n*2l!dqp6wxjnz4kgv5y=2m6en@l495gb9@&$#o89%8oy75g'
11+
SECRET_KEY = "-%n*2l!dqp6wxjnz4kgv5y=2m6en@l495gb9@&$#o89%8oy75g"
1212

1313
DATABASES = {
14-
'default': {
15-
'ENGINE': 'django.db.backends.sqlite3',
14+
"default": {
15+
"ENGINE": "django.db.backends.sqlite3",
1616
#'NAME': ':memory:',
17-
'TEST': {
18-
'NAME': 'testdb.sqlite3',
17+
"TEST": {
18+
"NAME": "testdb.sqlite3",
1919
},
20-
'OPTIONS': {
21-
'timeout': 5
22-
}
20+
"OPTIONS": {"timeout": 5},
2321
}
2422
}
2523

26-
ROOT_URLCONF = 'tests.urls'
24+
ROOT_URLCONF = "tests.urls"
2725

2826
INSTALLED_APPS = [
29-
'django_async_orm.apps.AsyncOrmConfig',
30-
'tests',
27+
"django_async_orm.apps.AsyncOrmConfig",
28+
"tests",
3129
]
3230

33-
MIDDLEWARE = [
34-
]
31+
MIDDLEWARE = []
3532

3633

3734
SITE_ID = 1
3835

3936
LOGGING = {
40-
'version': 1,
41-
'disable_existing_loggers': False,
42-
'handlers': {
43-
'console': {
44-
'class': 'logging.StreamHandler',
37+
"version": 1,
38+
"disable_existing_loggers": False,
39+
"handlers": {
40+
"console": {
41+
"class": "logging.StreamHandler",
4542
},
4643
},
47-
'root': {
48-
'handlers': ['console'],
49-
'level': 'WARNING',
44+
"root": {
45+
"handlers": ["console"],
46+
"level": "WARNING",
5047
},
5148
}

‎tests/test_django_async_orm.py‎

Lines changed: 70 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -1,59 +1,62 @@
1-
from django.test import TestCase, tag, TransactionTestCase
2-
from django.apps import apps
31
from unittest import IsolatedAsyncioTestCase
2+
3+
from django.apps import apps
4+
from django.test import TestCase, TransactionTestCase, tag
5+
46
from .models import TestModel
57

68

79
class AppLoadingTestCase(TestCase):
8-
9-
@tag('ci')
10+
@tag("ci")
1011
def test_dao_loaded(self):
11-
self.assertTrue(apps.is_installed('django_async_orm'))
12+
self.assertTrue(apps.is_installed("django_async_orm"))
1213

13-
@tag('ci')
14+
@tag("ci")
1415
def test_manager_is_async(self):
1516
manager_class_name = TestModel.objects.__class__.__name__
1617
self.assertTrue(
17-
manager_class_name.startswith('MixinAsync'),
18-
'Manager class name is %s but should start with "MixinAsync"' % (manager_class_name) )
18+
manager_class_name.startswith("MixinAsync"),
19+
'Manager class name is %s but should start with "MixinAsync"'
20+
% (manager_class_name),
21+
)
1922

2023

2124
class ModelTestCase(TransactionTestCase, IsolatedAsyncioTestCase):
22-
2325
async def asyncSetUp(self):
24-
await TestModel.objects.async_create(name="setup 1", obj_type='setup')
25-
await TestModel.objects.async_create(name="setup 2", obj_type='setup')
26+
await TestModel.objects.async_create(name="setup 1", obj_type="setup")
27+
await TestModel.objects.async_create(name="setup 2", obj_type="setup")
2628

2729
async def asyncTearDown(self):
2830
await TestModel.objects.async_delete()
2931

30-
@tag('ci')
32+
@tag("ci")
3133
async def test_async_get(self):
3234
result = await TestModel.objects.async_get(name="setup 1")
3335
self.assertEqual(result.name, "setup 1")
3436

35-
@tag('ci')
37+
@tag("ci")
3638
async def test_async_create(self):
3739
result = await TestModel.objects.async_create(name="test")
38-
self.assertEqual(result.name, 'test')
40+
self.assertEqual(result.name, "test")
3941

40-
@tag('ci')
42+
@tag("ci")
4143
async def test_async_bulk_create(self):
42-
objs = await TestModel.objects.async_bulk_create([
43-
TestModel(name='bulk create 1'),
44-
TestModel(name='bulk create 2'),
45-
])
44+
objs = await TestModel.objects.async_bulk_create(
45+
[
46+
TestModel(name="bulk create 1"),
47+
TestModel(name="bulk create 2"),
48+
]
49+
)
4650
objs = await TestModel.objects.async_all()
4751
objs = await objs.async_count()
4852
self.assertEqual(objs, 4)
4953

50-
@tag('dev')
54+
@tag("dev")
5155
async def test_async_bulk_update(self):
5256
self.assertTrue(False, "Not Implemented")
5357

54-
@tag('ci')
58+
@tag("ci")
5559
async def test_async_get_or_create(self):
56-
5760
async def test_async_get_or_create_on_obj_get(self):
5861
obj = await TestModel.objects.async_get_or_create(name="setup 1")
5962
self.assertEqual(obj[1], False)
@@ -66,39 +69,39 @@ async def test_async_get_or_create_on_obj_create(self):
6669
await test_async_get_or_create_on_obj_get(self)
6770
await test_async_get_or_create_on_obj_create(self)
6871

69-
@tag('dev')
72+
@tag("dev")
7073
async def test_async_update_or_create(self):
7174
self.assertTrue(False, "Not Implemented")
7275

73-
@tag('ci')
76+
@tag("ci")
7477
async def test_async_earliest(self):
7578
first = await (await TestModel.objects.async_all()).async_first()
76-
earliest = await TestModel.objects.async_earliest('id')
79+
earliest = await TestModel.objects.async_earliest("id")
7780
self.assertTrue(earliest.id, first.id)
7881

79-
@tag('ci')
82+
@tag("ci")
8083
async def test_async_latest(self):
81-
created = await TestModel.objects.async_create(name='latest')
82-
latest = await TestModel.objects.async_latest('id')
84+
created = await TestModel.objects.async_create(name="latest")
85+
latest = await TestModel.objects.async_latest("id")
8386
self.assertEqual(latest.id, created.id)
8487

85-
@tag('ci')
88+
@tag("ci")
8689
async def test_async_first_in_all(self):
8790
all_result = await TestModel.objects.async_all()
8891
first = await all_result.async_first()
8992
self.assertEqual(all_result[0].name, first.name)
9093

91-
@tag('ci')
94+
@tag("ci")
9295
async def test_async_last_in_all(self):
9396
all_result = await TestModel.objects.async_all()
9497
last = await all_result.async_last()
9598
self.assertEqual(all_result[1].name, last.name)
9699

97-
@tag('dev')
100+
@tag("dev")
98101
async def test_async_in_bulk(self):
99102
self.assertTrue(False, "Not Implemented")
100103

101-
@tag('ci')
104+
@tag("ci")
102105
async def test_async_delete(self):
103106
created = await TestModel.objects.async_create(name="to delete")
104107
all_created = await TestModel.objects.async_all()
@@ -110,143 +113,144 @@ async def test_async_delete(self):
110113
count = await all_after_delete.async_count()
111114
self.assertEqual(count, 0)
112115

113-
@tag('ci')
116+
@tag("ci")
114117
async def test_async_update(self):
115118
created = await TestModel.objects.async_create(name="to update")
116119
qs = await TestModel.objects.async_filter(name="to update")
117120
updated = await qs.async_update(name="updated")
118121
self.assertEqual(updated, 1)
119122

120-
@tag('ci')
123+
@tag("ci")
121124
async def test_async_exists(self):
122-
qs = await TestModel.objects.async_filter(name='setup 1')
125+
qs = await TestModel.objects.async_filter(name="setup 1")
123126
exists = await qs.async_exists()
124127
self.assertTrue(exists)
125128

126-
@tag('ci')
129+
@tag("ci")
127130
async def test_async_explain(self):
128-
explained = await (await TestModel.objects.async_filter(name="setup 1")).async_explain()
131+
explained = await (
132+
await TestModel.objects.async_filter(name="setup 1")
133+
).async_explain()
129134
print(explained)
130135
self.assertEqual(explained, "2 0 0 SCAN TABLE tests_testmodel")
131136

132-
@tag('dev')
137+
@tag("dev")
133138
async def test_async_raw(self):
134-
rs = await TestModel.objects.async_raw('SELECT * from tests_testmodel')
139+
rs = await TestModel.objects.async_raw("SELECT * from tests_testmodel")
135140
print(list(rs))
136141

137-
@tag('ci')
142+
@tag("ci")
138143
async def test_async_count(self):
139144
result = await TestModel.objects.async_all()
140145
result = await result.async_count()
141146
self.assertEqual(result, 2)
142147

143-
@tag('ci')
148+
@tag("ci")
144149
async def test_async_none(self):
145150
result = await TestModel.objects.async_none()
146151
self.assertEqual(list(result), [])
147152

148-
@tag('ci')
153+
@tag("ci")
149154
async def test_async_aiter(self):
150155
all_qs = await TestModel.objects.async_all()
151156
count = 0
152157
async for obj in all_qs:
153158
count += 1
154159
self.assertEqual(count, 2)
155160

156-
@tag('dev')
161+
@tag("dev")
157162
async def test_async_fetch_all(self):
158163
self.assertTrue(False, "Not Implemented")
159164

160-
@tag('ci')
165+
@tag("ci")
161166
async def test_async_all(self):
162167
result = await TestModel.objects.async_all()
163168
result = await result.async_count()
164169
self.assertEqual(result, 2)
165170

166-
@tag('ci')
171+
@tag("ci")
167172
async def test_async_filter(self):
168173
qs = await TestModel.objects.async_filter(name="setup 2")
169174
element = await qs.async_first()
170175
self.assertEqual(element.name, "setup 2")
171176

172-
@tag('ci')
177+
@tag("ci")
173178
async def test_async_exclude(self):
174179
qs = await TestModel.objects.async_filter(obj_type="setup")
175180
qs = await qs.async_exclude(name="setup 1")
176181
el = await qs.async_first()
177182
self.assertEqual(el.name, "setup 2")
178183

179-
@tag('dev')
184+
@tag("dev")
180185
async def test_async_complex_filter(self):
181186
self.assertTrue(False, "Not Implemented")
182187

183-
@tag('dev')
188+
@tag("dev")
184189
async def test_async_union(self):
185190
self.assertTrue(False, "Not Implemented")
186191

187-
@tag('dev')
192+
@tag("dev")
188193
async def test_async_intersection(self):
189194
self.assertTrue(False, "Not Implemented")
190195

191-
@tag('dev')
196+
@tag("dev")
192197
async def test_async_difference(self):
193198
self.assertTrue(False, "Not Implemented")
194199

195-
@tag('dev')
200+
@tag("dev")
196201
async def test_async_select_for_update(self):
197202
self.assertTrue(False, "Not Implemented")
198203

199-
@tag('dev')
204+
@tag("dev")
200205
async def test_async_prefetch_related(self):
201206
self.assertTrue(False, "Not Implemented")
202207

203-
@tag('dev')
208+
@tag("dev")
204209
async def test_async_annotate(self):
205210
self.assertTrue(False, "Not Implemented")
206211

207-
@tag('ci')
212+
@tag("ci")
208213
async def test_async_order_by_ascending(self):
209214
qs = await TestModel.objects.async_all()
210-
qs = await qs.async_order_by('name')
215+
qs = await qs.async_order_by("name")
211216
qs = await qs.async_first()
212217
self.assertEqual(qs.name, "setup 1")
213218

214-
@tag('ci')
219+
@tag("ci")
215220
async def test_async_order_by_descending(self):
216221
qs = await TestModel.objects.async_all()
217-
qs = await qs.async_order_by('-name')
222+
qs = await qs.async_order_by("-name")
218223
qs = await qs.async_first()
219224
self.assertEqual(qs.name, "setup 2")
220225

221-
@tag('dev')
226+
@tag("dev")
222227
async def test_async_distinct(self):
223228
self.assertTrue(False, "Not Implemented")
224229

225-
@tag('dev')
230+
@tag("dev")
226231
async def test_async_extra(self):
227232
self.assertTrue(False, "Not Implemented")
228233

229-
@tag('dev')
234+
@tag("dev")
230235
async def test_async_reverse(self):
231236
self.assertTrue(False, "Not Implemented")
232237

233-
@tag('dev')
238+
@tag("dev")
234239
async def test_async_defer(self):
235240
self.assertTrue(False, "Not Implemented")
236241

237-
@tag('dev')
242+
@tag("dev")
238243
async def test_async_only(self):
239244
self.assertTrue(False, "Not Implemented")
240245

241-
@tag('dev')
246+
@tag("dev")
242247
async def test_async_using(self):
243248
self.assertTrue(False, "Not Implemented")
244249

245-
@tag('dev')
250+
@tag("dev")
246251
async def test_async_resolve_expression(self):
247252
self.assertTrue(False, "Not Implemented")
248253

249-
@tag('dev')
254+
@tag("dev")
250255
async def test_async_async_ordered(self):
251256
self.assertTrue(False, "Not Implemented")
252-

0 commit comments

Comments
 (0)