From bc5d61e85dffec5b7cbe26edda202c7a0feb8ee0 Mon Sep 17 00:00:00 2001 From: Daniel Hahler Date: Sat, 5 May 2018 01:42:55 +0200 Subject: [PATCH] tests: remove some dead code, use `assert 0` for never called methods --- tests/test_viewsets.py | 26 +++++++++++++------------- tests/test_write_only_fields.py | 3 --- 2 files changed, 13 insertions(+), 16 deletions(-) diff --git a/tests/test_viewsets.py b/tests/test_viewsets.py index 25feb0f37..0e7fb53ee 100644 --- a/tests/test_viewsets.py +++ b/tests/test_viewsets.py @@ -1,3 +1,4 @@ +import pytest from django.conf.urls import include, url from django.db import models from django.test import TestCase, override_settings @@ -34,26 +35,26 @@ class ActionViewSet(GenericViewSet): queryset = Action.objects.all() def list(self, request, *args, **kwargs): - pass + assert 0, 'never called' # pragma: no cover def retrieve(self, request, *args, **kwargs): - pass + assert 0, 'never called' # pragma: no cover @action(detail=False) def list_action(self, request, *args, **kwargs): - pass + assert 0, 'never called' # pragma: no cover @action(detail=False, url_name='list-custom') def custom_list_action(self, request, *args, **kwargs): - pass + assert 0, 'never called' # pragma: no cover @action(detail=True) def detail_action(self, request, *args, **kwargs): - pass + assert 0, 'never called' # pragma: no cover @action(detail=True, url_name='detail-custom') def custom_detail_action(self, request, *args, **kwargs): - pass + assert 0, 'never called' # pragma: no cover router = SimpleRouter() @@ -87,14 +88,13 @@ class InitializeViewSetsTestCase(TestCase): assert response.status_code == status.HTTP_200_OK def test_initialize_view_set_with_empty_actions(self): - try: + with pytest.raises(TypeError) as excinfo: BasicViewSet.as_view() - except TypeError as e: - assert str(e) == ("The `actions` argument must be provided " - "when calling `.as_view()` on a ViewSet. " - "For example `.as_view({'get': 'list'})`") - else: - self.fail("actions must not be empty.") + + assert str(excinfo.value) == ( + "The `actions` argument must be provided " + "when calling `.as_view()` on a ViewSet. " + "For example `.as_view({'get': 'list'})`") def test_args_kwargs_request_action_map_on_self(self): """ diff --git a/tests/test_write_only_fields.py b/tests/test_write_only_fields.py index 272a05ff3..6439dee05 100644 --- a/tests/test_write_only_fields.py +++ b/tests/test_write_only_fields.py @@ -9,9 +9,6 @@ class WriteOnlyFieldTests(TestCase): email = serializers.EmailField() password = serializers.CharField(write_only=True) - def create(self, attrs): - return attrs - self.Serializer = ExampleSerializer def write_only_fields_are_present_on_input(self):