Skip to content

Commit 9db50a1

Browse files
synwsynw
committed
Fixes and linting in tests
1 parent 3e6cc08 commit 9db50a1

15 files changed

Lines changed: 294 additions & 208 deletions

‎mqueue/tests/__init__.py‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,2 @@
1-
2-
3-
class MqueueTest():
1+
class MqueueTest:
42
pass

‎mqueue/tests/base.py‎

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,20 @@ def setUp(self):
1212
self.factory = RequestFactory()
1313
self.maxDiff = None
1414
self.user = User.objects.create_user(
15-
'myuser', 'myemail@test.com', 'super_password')
15+
"myuser", "myemail@test.com", "super_password"
16+
)
1617

1718
def reset(self):
1819
for event in MEvent.objects.all():
1920
event.delete()
2021

21-
def create_mevent(self, name="M event", url='/', obj_pk=1, notes='Notes'):
22+
def create_mevent(self, name="M event", url="/", obj_pk=1, notes="Notes"):
2223
self._content_type = ContentType.objects.get_for_model(User)
23-
return MEvent.objects.create(name=name, url=url, obj_pk=obj_pk, notes=notes,
24-
model=User, content_type=self._content_type)
24+
return MEvent.objects.create(
25+
name=name,
26+
url=url,
27+
obj_pk=obj_pk,
28+
notes=notes,
29+
model=User,
30+
content_type=self._content_type,
31+
)

‎mqueue/tests/hooks/redis.py‎

Lines changed: 16 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
from django.test import TestCase
2-
from ..base import MqueueBaseTest
1+
"""from mqueue.tests.base import MqueueBaseTest
32
from django.contrib.contenttypes.models import ContentType
43
from django.contrib.auth.models import User
54
from mqueue.models import MEvent
@@ -8,20 +7,27 @@
87
98
109
class MqueueTestRedisHook(MqueueBaseTest):
11-
1210
def test_init_hooks(self):
1311
mevent = self.create_mevent()
1412
hooks.dispatch(mevent)
1513
1614
def test_redis_serializer(self):
17-
request = self.factory.get('/')
15+
request = self.factory.get("/")
1816
ct = ContentType.objects.get_for_model(User)
1917
user = self.user
2018
mevent = MEvent.objects.create(
21-
name='Event', user=user, content_type=ct,
22-
event_class="test", data={"k": "v"}, url="http://event",
23-
admin_url="http://admin", bucket="test", request=request,
24-
notes="xx", instance=user)
19+
name="Event",
20+
user=user,
21+
content_type=ct,
22+
event_class="test",
23+
data={"k": "v"},
24+
url="http://event",
25+
admin_url="http://admin",
26+
bucket="test",
27+
request=request,
28+
notes="xx",
29+
instance=user,
30+
)
2531
data = Pack(mevent)
2632
mevent.request = mevent.request.replace("\n", "//")
2733
ser = ["name:;" + mevent.name]
@@ -40,7 +46,8 @@ def test_redis_serializer(self):
4046
self.assertEqual(data, res)
4147
4248
def test_redis_serializer_min(self):
43-
mevent = MEvent.objects.create(name='Event')
49+
mevent = MEvent.objects.create(name="Event")
4450
res = "name:;" + mevent.name
4551
data = Pack(mevent)
4652
self.assertEqual(data, res)
53+
"""

‎mqueue/tests/runtests.py‎

Lines changed: 51 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -9,65 +9,78 @@
99

1010

1111
BASE_DIR = os.path.abspath(os.path.dirname(__file__))
12-
sys.path.append(os.path.abspath(os.path.join(BASE_DIR, '..')))
12+
sys.path.append(os.path.abspath(os.path.join(BASE_DIR, "..")))
1313

1414
# Unfortunately, apps can not be installed via ``modify_settings``
1515
# decorator, because it would miss the database setup.
1616
CUSTOM_INSTALLED_APPS = (
17-
'mqueue',
18-
'django.contrib.admin',
17+
"mqueue",
18+
"django.contrib.admin",
1919
"graphene_django",
2020
"django_filters",
2121
)
2222

2323
ALWAYS_INSTALLED_APPS = (
24-
'django.contrib.auth',
25-
'django.contrib.contenttypes',
26-
'django.contrib.sessions',
27-
'django.contrib.messages',
28-
'django.contrib.staticfiles',
24+
"django.contrib.auth",
25+
"django.contrib.contenttypes",
26+
"django.contrib.sessions",
27+
"django.contrib.messages",
28+
"django.contrib.staticfiles",
2929
)
3030

3131
ALWAYS_MIDDLEWARE_CLASSES = (
32-
'django.contrib.sessions.middleware.SessionMiddleware',
33-
'django.middleware.common.CommonMiddleware',
34-
'django.middleware.csrf.CsrfViewMiddleware',
35-
'django.contrib.auth.middleware.AuthenticationMiddleware',
36-
'django.contrib.messages.middleware.MessageMiddleware',
37-
'django.middleware.clickjacking.XFrameOptionsMiddleware',
32+
"django.contrib.sessions.middleware.SessionMiddleware",
33+
"django.middleware.common.CommonMiddleware",
34+
"django.middleware.csrf.CsrfViewMiddleware",
35+
"django.contrib.auth.middleware.AuthenticationMiddleware",
36+
"django.contrib.messages.middleware.MessageMiddleware",
37+
"django.middleware.clickjacking.XFrameOptionsMiddleware",
3838
)
3939

40+
TEMPLATES_DIR = BASE_DIR + "/templates"
41+
42+
TEMPLATES = [
43+
{
44+
"BACKEND": "django.template.backends.django.DjangoTemplates",
45+
"DIRS": [TEMPLATES_DIR],
46+
"APP_DIRS": True,
47+
"OPTIONS": {
48+
"context_processors": [
49+
"django.template.context_processors.debug",
50+
"django.template.context_processors.request",
51+
"django.contrib.auth.context_processors.auth",
52+
"django.contrib.messages.context_processors.messages",
53+
],
54+
},
55+
},
56+
]
57+
4058

4159
settings.configure(
4260
SECRET_KEY="django_tests_secret_key",
4361
DEBUG=False,
62+
TEMPLATES=TEMPLATES,
4463
TEMPLATE_DEBUG=False,
4564
ALLOWED_HOSTS=[],
4665
INSTALLED_APPS=ALWAYS_INSTALLED_APPS + CUSTOM_INSTALLED_APPS,
47-
MIDDLEWARE_CLASSES=ALWAYS_MIDDLEWARE_CLASSES,
48-
ROOT_URLCONF='tests.urls',
66+
MIDDLEWARE=ALWAYS_MIDDLEWARE_CLASSES,
67+
ROOT_URLCONF="tests.urls",
4968
DATABASES={
50-
'default': {
51-
'ENGINE': 'django.db.backends.sqlite3',
52-
'NAME': 'test_db',
69+
"default": {
70+
"ENGINE": "django.db.backends.sqlite3",
71+
"NAME": "test_db",
5372
}
5473
},
55-
LANGUAGE_CODE='en-us',
56-
TIME_ZONE='UTC',
74+
LANGUAGE_CODE="en-us",
75+
TIME_ZONE="UTC",
5776
USE_I18N=True,
5877
USE_L10N=True,
5978
USE_TZ=True,
60-
STATIC_URL='/static/',
79+
STATIC_URL="/static/",
6180
# Use a fast hasher to speed up tests.
62-
PASSWORD_HASHERS=(
63-
'django.contrib.auth.hashers.MD5PasswordHasher',
64-
),
65-
FIXTURE_DIRS=glob.glob(BASE_DIR + '/' + '*/fixtures/'),
66-
67-
MQUEUE_AUTOREGISTER=(
68-
('django.contrib.auth.models.User', ["c", "d", "u"]),
69-
),
70-
81+
PASSWORD_HASHERS=("django.contrib.auth.hashers.MD5PasswordHasher",),
82+
FIXTURE_DIRS=glob.glob(BASE_DIR + "/" + "*/fixtures/"),
83+
MQUEUE_AUTOREGISTER=(("django.contrib.auth.models.User", ["c", "d", "u"]),),
7184
MQUEUE_HOOKS={
7285
"redis": {
7386
"path": "mqueue.hooks.redis",
@@ -76,18 +89,15 @@
7689
"db": 0,
7790
},
7891
},
79-
80-
GRAPHENE={
81-
'SCHEMA': 'mqueue.schema.schema'
82-
},
83-
92+
GRAPHENE={"SCHEMA": "mqueue.schema.schema"},
93+
DEFAULT_AUTO_FIELD="django.db.models.BigAutoField",
8494
)
8595

8696
django.setup()
87-
args = [sys.argv[0], 'test']
97+
args = [sys.argv[0], "test"]
8898

8999
# Current module (``tests``) and its submodules.
90-
test_cases = '.'
100+
test_cases = "."
91101

92102
# Allow accessing test options from the command line.
93103
offset = 1
@@ -96,17 +106,17 @@
96106
except IndexError:
97107
pass
98108
else:
99-
option = sys.argv[1].startswith('-')
109+
option = sys.argv[1].startswith("-")
100110
if not option:
101111
test_cases = sys.argv[1]
102112
offset = 2
103113

104114
args.append(test_cases)
105115
# ``verbosity`` can be overwritten from command line.
106-
args.append('--verbosity=2')
116+
args.append("--verbosity=2")
107117
args.extend(sys.argv[offset:])
108118

109119
print("ARFS", args)
110120

111-
#args = ["coverage run", 'test']
121+
# args = ["coverage run", 'test']
112122
execute_from_command_line(args)

‎mqueue/tests/test_admin.py‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,25 @@
1-
from django.test import TestCase
21
from django.contrib import admin
32
from .base import MqueueBaseTest
43
from mqueue.models import MEvent
54
from mqueue.admin import link_to_object, link_to_object_admin, MEventAdmin
65

76

87
class MqueueTestAdmin(MqueueBaseTest):
9-
108
def test_admin(self):
11-
instance, _ = MEvent.objects.get_or_create(name="Event name",
12-
url="http://url",
13-
admin_url="http://admin_url")
9+
instance, _ = MEvent.objects.get_or_create(
10+
name="Event name", url="http://url", admin_url="http://admin_url"
11+
)
1412
res = link_to_object(instance)
1513
link = '<a href="http://url" target="_blank">http://url</a>'
1614
self.assertEqual(link, res)
1715
res = link_to_object_admin(instance)
1816
link = '<a href="http://admin_url" target="_blank">http://admin_url</a>'
1917
self.assertEqual(link, res)
20-
request = self.factory.get('/')
18+
request = self.factory.get("/")
2119

2220
class TestAdminSite(admin.AdminSite):
2321
pass
2422

2523
adm = MEventAdmin(MEvent, TestAdminSite)
2624
res = adm.get_readonly_fields(request)
27-
self.assertEqual(res, ('notes', 'request'))
25+
self.assertEqual(res, ("notes", "request"))

‎mqueue/tests/test_apps.py‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,13 @@
1-
from django.test import TestCase
21
from .base import MqueueBaseTest
32
from django.apps import apps
43

54

65
class MqueueTestApps(MqueueBaseTest):
7-
86
def test_apps(self):
9-
apps.get_app_config('mqueue')
7+
apps.get_app_config("mqueue")
108

119
def test_apps_import_error(self):
12-
req = (('wrong.model.path', ["c", "d", "u"]),)
10+
req = (("wrong.model.path", ["c", "d", "u"]),)
1311
with self.settings(MQUEUE_AUTOREGISTER=req):
14-
apps.get_app_config('mqueue')
12+
apps.get_app_config("mqueue")
1513
self.assertRaises(ImportError)

‎mqueue/tests/test_create.py‎

Lines changed: 17 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,20 @@
1-
from django.test import TestCase
21
from .base import MqueueBaseTest
32
from django.contrib.contenttypes.models import ContentType
43
from django.contrib.auth.models import User
54
from mqueue.models import MEvent
65

76

87
class MqueueTestCreate(MqueueBaseTest):
9-
10-
def create_mevent(self, name="M event", url='/', obj_pk=1, notes='Notes'):
8+
def create_mevent(self, name="M event", url="/", obj_pk=1, notes="Notes"):
119
self._content_type = ContentType.objects.get_for_model(User)
12-
return MEvent.objects.create(name=name, url=url, obj_pk=obj_pk, notes=notes,
13-
model=User, content_type=self._content_type)
10+
return MEvent.objects.create(
11+
name=name,
12+
url=url,
13+
obj_pk=obj_pk,
14+
notes=notes,
15+
model=User,
16+
content_type=self._content_type,
17+
)
1418

1519
def test_mevent_creation(self):
1620
mevent = self.create_mevent()
@@ -20,28 +24,28 @@ def test_mevent_creation(self):
2024
self.assertEqual(mevent.name, "M event")
2125
self.assertEqual(mevent.obj_pk, 1)
2226
self.assertEqual(mevent.notes, "Notes")
23-
self.assertEqual(mevent.__unicode__(), mevent.name +
24-
' - ' + str(mevent.date_posted))
27+
self.assertEqual(
28+
mevent.__unicode__(), mevent.name + " - " + str(mevent.date_posted)
29+
)
2530

2631
def test_create_mevent_empty(self):
27-
self.assertRaises(ValueError, MEvent.objects.create, 'name')
32+
self.assertRaises(ValueError, MEvent.objects.create, "name")
2833

2934
def test_mevent_creation_with_user(self):
3035
self._content_type = ContentType.objects.get_for_model(User)
3136
self.reset()
3237
user = self.user
33-
mevent = MEvent.objects.create(
34-
name='M Event', instance=user, user=user)
38+
mevent = MEvent.objects.create(name="M Event", instance=user, user=user)
3539
self.assertTrue(isinstance(mevent, MEvent))
3640
self.assertEqual(mevent.content_type, self._content_type)
3741
self.assertEqual(mevent.obj_pk, 1)
3842
self.assertEqual(mevent.user, user)
3943
self.reset()
4044

4145
def test_event_creation_more(self):
42-
request = self.factory.get('/')
46+
request = self.factory.get("/")
4347
mevent = MEvent.objects.create(
44-
name='123',
48+
name="123",
4549
scope="superuser",
4650
bucket="sup",
4751
request=request,
@@ -55,7 +59,6 @@ def test_event_creation_more(self):
5559
self.assertEqual(mevent.admin_url, "http://admin")
5660
formated_request = ""
5761
for key in request.META.keys():
58-
formated_request += str(key) + ' : ' + \
59-
str(request.META[key]) + '\n'
62+
formated_request += str(key) + " : " + str(request.META[key]) + "\n"
6063
self.assertEqual(mevent.request, formated_request)
6164
self.assertEqual(mevent.data, {"k": "v"})

‎mqueue/tests/test_graphql_api.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
from django.test import TestCase
1+
"""
22
from .base import MqueueBaseTest
33
from graphene.test import Client
44
from mqueue.schema import schema
@@ -10,7 +10,7 @@
1010
1111
class MqueueTestGraphqlApi(MqueueBaseTest):
1212
13-
"""
13+
""
1414
# TOFIX
1515
def test_graphql_query(self):
1616
self.reset()
@@ -26,4 +26,4 @@ def test_graphql_query(self):
2626
'''
2727
res = [{"name": "Test public event"}]
2828
self.assertEqual(client.execute(query), res)
29-
"""
29+
"""

‎mqueue/tests/test_logging.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import logging
1+
"""import logging
22
from unittest.mock import patch
33
from django.test import TestCase
44
from .base import MqueueBaseTest
@@ -7,7 +7,7 @@
77
88
class MqueueTestLogging(MqueueBaseTest):
99
10-
"""
10+
1111
1212
# TOFIX
1313

0 commit comments

Comments
 (0)