From dc47c12efc2c793fc24b73f81a589c251c48a089 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A1=D1=82=D0=B5=D0=BF=D0=B0=D0=BD=D0=B5=D0=BD=D0=BA?= =?UTF-8?q?=D0=BE=20=D0=9E=D0=BB=D1=8C=D0=B3=D0=B0?= Date: Sun, 23 May 2021 21:05:06 +0300 Subject: [PATCH] Fix problem in test for pylint --- README.rst | 2 +- access_controller/settings.py | 2 -- main/tests.py | 23 +++++++++++++++-------- main/views.py | 5 ++++- 4 files changed, 20 insertions(+), 12 deletions(-) diff --git a/README.rst b/README.rst index 8c9907d..721f60a 100644 --- a/README.rst +++ b/README.rst @@ -170,7 +170,7 @@ Quickstart Для проверки pylint используем: ------------------------------- -pylint --django-settings-module=access_controller.access_controller.settings ../access_controller (каталог, где лежит проект) +pylint ../access_controller_new (каталог, где лежит проект) Для приведения файлов к стандарту PEP8 используем: -------------------------------------------------- diff --git a/access_controller/settings.py b/access_controller/settings.py index 30875f6..3f15f93 100644 --- a/access_controller/settings.py +++ b/access_controller/settings.py @@ -12,8 +12,6 @@ https://docs.djangoproject.com/en/3.1/ref/settings/ import os from pathlib import Path - - from dotenv import load_dotenv # Build paths inside the project like this: BASE_DIR / 'subdir'. diff --git a/main/tests.py b/main/tests.py index 4353ddf..6ebf157 100644 --- a/main/tests.py +++ b/main/tests.py @@ -1,3 +1,8 @@ +""" +Тестирование работы программы. +""" + + import random from unittest.mock import patch, Mock @@ -218,7 +223,8 @@ class MakeEngineerTestCase(UsersBaseTestCase): """ self.admin_client.post( reverse_lazy('control'), - data={'users': [get_user_model().objects.get(email=self.light_agent).userprofile.id], 'engineer': 'engineer'} + data={'users': [get_user_model().objects.get(email=self.light_agent).userprofile.id], + 'engineer': 'engineer'} ) call_list = zenpy_mock.update_user.call_args_list mock_object = call_list[0][0][0] @@ -356,7 +362,8 @@ class MakeLightAgentTestCase(UsersBaseTestCase): """ self.admin_client.post( reverse_lazy('control'), - data={'users': [get_user_model().objects.get(email=self.engineer).userprofile.id], 'light_agent': 'light_agent'} + data={'users': [get_user_model().objects.get(email=self.engineer).userprofile.id], + 'light_agent': 'light_agent'} ) call_list = zenpy_mock.update_user.call_args_list mock_object = call_list[0][0][0] @@ -447,7 +454,8 @@ class PasswordResetTestCase(UsersBaseTestCase): Проверяет отсутствие отправки письма о смене пароля. """ with self.settings(EMAIL_BACKEND=self.email_backend): - resp = self.agent_client.post(reverse_lazy('password_reset'), data={'email': self.light_agent + str(random.random())}) + resp = self.agent_client.post(reverse_lazy('password_reset'), + data={'email': self.light_agent + str(random.random())}) self.assertRedirects(resp, reverse('password_reset_done')) self.assertEqual(resp.status_code, 302) self.assertEqual(len(mail.outbox), 0) @@ -635,11 +643,11 @@ class GetTicketsTestCase(UsersBaseTestCase): @patch('main.views.zenpy') @patch('main.views.get_tickets_list_for_group') - def test_take_zero_tickets(self, TicketsMock, zenpy_mock): + def test_take_zero_tickets(self, tickets_mock, zenpy_mock): """ Функция проверки попытки назначения нуля тикета на engineer. """ - TicketsMock.return_value = [Mock()] * 3 + tickets_mock.return_value = [Mock()] * 3 zenpy_mock.get_user.return_value = Mock(role='agent', custom_role_id=sets.ZENDESK_ROLES['engineer']) self.engineer_client.post(reverse('work_get_tickets'), data={'count_tickets': 0}) tickets = zenpy_mock.update_tickets.call_args[0][0] @@ -730,9 +738,8 @@ class LoggingTestCase(UsersBaseTestCase): @staticmethod def get_file_output(): - file = open('logs/logs.csv', 'r') - file_output = file.readlines()[-1] - file.close() + with open('logs/logs.csv', 'r') as file: + file_output = file.readlines()[-1] return file_output def test_engineer_with_admin(self): diff --git a/main/views.py b/main/views.py index 44ce560..07f4cc5 100644 --- a/main/views.py +++ b/main/views.py @@ -453,5 +453,8 @@ def statistic_page(request: WSGIRequest) -> HttpResponse: context['form'] = form return render(request, 'pages/statistic.html', context) -def registration_failed(request): +def registration_failed(request: WSGIRequest) -> HttpResponse: + """ + Функция отображения страницы "Регистрация закрыта". + """ return render(request, 'pages/registration_failed.html')