diff options
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/extras/__init__.py | 0 | ||||
| -rw-r--r-- | tests/extras/bad_import.py | 1 | ||||
| -rw-r--r-- | tests/test_settings.py | 27 | 
3 files changed, 11 insertions, 17 deletions
| diff --git a/tests/extras/__init__.py b/tests/extras/__init__.py deleted file mode 100644 index e69de29b..00000000 --- a/tests/extras/__init__.py +++ /dev/null diff --git a/tests/extras/bad_import.py b/tests/extras/bad_import.py deleted file mode 100644 index 68263d94..00000000 --- a/tests/extras/bad_import.py +++ /dev/null @@ -1 +0,0 @@ -raise ValueError diff --git a/tests/test_settings.py b/tests/test_settings.py index e29fc34a..f2ff4ca1 100644 --- a/tests/test_settings.py +++ b/tests/test_settings.py @@ -1,22 +1,17 @@ -"""Tests for the settings module"""  from __future__ import unicode_literals  from django.test import TestCase - -from rest_framework.settings import APISettings, DEFAULTS, IMPORT_STRINGS +from rest_framework.settings import APISettings  class TestSettings(TestCase): -    """Tests relating to the api settings""" - -    def test_non_import_errors(self): -        """Make sure other errors aren't suppressed.""" -        settings = APISettings({'DEFAULT_MODEL_SERIALIZER_CLASS': 'tests.extras.bad_import.ModelSerializer'}, DEFAULTS, IMPORT_STRINGS) -        with self.assertRaises(ValueError): -            settings.DEFAULT_MODEL_SERIALIZER_CLASS -      def test_import_error_message_maintained(self): -        """Make sure real import errors are captured and raised sensibly.""" -        settings = APISettings({'DEFAULT_MODEL_SERIALIZER_CLASS': 'tests.extras.not_here.ModelSerializer'}, DEFAULTS, IMPORT_STRINGS) -        with self.assertRaises(ImportError) as cm: -            settings.DEFAULT_MODEL_SERIALIZER_CLASS -        self.assertTrue('ImportError' in str(cm.exception)) +        """ +        Make sure import errors are captured and raised sensibly. +        """ +        settings = APISettings({ +            'DEFAULT_RENDERER_CLASSES': [ +                'tests.invalid_module.InvalidClassName' +            ] +        }) +        with self.assertRaises(ImportError): +            settings.DEFAULT_RENDERER_CLASSES | 
