Merge pull request #538 from leukeleu/pytest

vstoykov · web-flow · commit a02cfdd0c1b1 · 2021-10-19T01:19:17.000+03:00
Fixed #537 -- Switch to pytest
diff --git a/.coveragerc b/.coveragerc
@@ -0,0 +1,9 @@
+[run]
+branch = true
+parallel = true
+
+[report]
+show_missing = true
+skip_empty = true
+skip_covered = true
+precision = 2
diff --git a/.github/workflows/python.yml b/.github/workflows/python.yml
@@ -13,7 +13,7 @@ jobs:
     strategy:
       max-parallel: 4
       matrix:
-        python-version: ['3.6', '3.7', '3.8', '3.9']
+        python-version: ['3.6', '3.7', '3.8', '3.9', '3.10']
 
     steps:
     - uses: actions/checkout@v2
diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst
@@ -11,7 +11,7 @@ contributions merged as quickly as possible:
    tests, first install tox, ``pip install tox``, then use ``tox``. This will let you know about any errors or style
    issues.
 4. While we're talking about tests, creating new ones for your code makes it
-   much easier for us to merge your code quickly. ImageKit uses nose_, so
+   much easier for us to merge your code quickly. ImageKit uses pytest_, so
    writing tests is painless. Check out `ours`__ for examples.
 5. It's a good idea to do your work in a branch; that way, you can work on more
    than one contribution at a time without making them interdependent.
@@ -20,5 +20,5 @@ contributions merged as quickly as possible:
 __ http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html
 __ https://groups.google.com/forum/#!forum/django-imagekit
 __ irc://irc.freenode.net/imagekit
-.. _nose: https://nose.readthedocs.org/en/latest/
+.. _pytest: https://docs.pytest.org/en/latest/
 __ https://github.com/matthewwithanm/django-imagekit/tree/develop/tests
diff --git a/MANIFEST.in b/MANIFEST.in
@@ -1,6 +1,8 @@
 include AUTHORS
 include LICENSE
 include README.rst
+include pytest.ini
+include test-requirements.txt
 include testrunner.py
 include setup.cfg
 include tests/*.py
diff --git a/pytest.ini b/pytest.ini
@@ -0,0 +1,3 @@
+[pytest]
+django_find_project = false
+DJANGO_SETTINGS_MODULE = tests.settings
diff --git a/setup.py b/setup.py
@@ -44,14 +44,6 @@ def exec_file(filepath, globalz=None, localz=None):
     packages=find_packages(exclude=['*.tests', '*.tests.*', 'tests.*', 'tests']),
     zip_safe=False,
     include_package_data=True,
-    tests_require=[
-        'beautifulsoup4>=4.4.0',
-        'nose>=1.3.6',
-        'django-nose>=1.4',
-        'Pillow',
-        'mock>=1.0.1',
-    ],
-    test_suite='testrunner.run_tests',
     install_requires=[
         'django-appconf>=0.5',
         'pilkit>=0.2.0',
diff --git a/test-requirements.txt b/test-requirements.txt
@@ -0,0 +1,6 @@
+# Test requirements
+beautifulsoup4
+Pillow
+pytest
+pytest-cov
+pytest-django
diff --git a/testrunner.py b/testrunner.py
diff --git a/tests/conftest.py b/tests/conftest.py
@@ -0,0 +1,8 @@
+import pytest
+
+from .utils import clear_imagekit_test_files
+
+
+@pytest.fixture(scope='session', autouse=True)
+def imagekit_test_files_teardown(request):
+    request.addfinalizer(clear_imagekit_test_files)
diff --git a/tests/imagegenerators.py b/tests/imagegenerators.py
@@ -3,7 +3,7 @@
 
 
 class TestSpec(ImageSpec):
-    pass
+    __test__ = False
 
 
 class ResizeTo1PixelSquare(ImageSpec):
diff --git a/tests/settings.py b/tests/settings.py
@@ -28,25 +28,8 @@
     'django.contrib.contenttypes',
     'imagekit',
     'tests',
-    'django_nose',
 ]
 
-TEST_RUNNER = 'django_nose.NoseTestSuiteRunner'
-NOSE_ARGS = [
-    '-s',
-
-    # When the tests are run --with-coverage, these args configure coverage
-    # reporting (requires coverage to be installed).
-    # Without the --with-coverage flag, they have no effect.
-    '--cover-tests',
-    '--cover-html',
-    '--cover-package=imagekit',
-    '--cover-html-dir=%s' % os.path.join(BASE_PATH, 'cover')
-]
-
-if os.getenv('TERM'):
-    NOSE_ARGS.append('--with-progressive')
-
 CACHE_BACKEND = 'locmem://'
 
 # Django >= 1.8
diff --git a/tests/test_abstract_models.py b/tests/test_abstract_models.py
@@ -1,9 +1,8 @@
 from imagekit.utils import get_nonabstract_descendants
-from nose.tools import eq_
 from . models import (AbstractImageModel, ConcreteImageModel,
                       ConcreteImageModelSubclass)
 
 
 def test_nonabstract_descendants_generator():
     descendants = list(get_nonabstract_descendants(AbstractImageModel))
-    eq_(descendants, [ConcreteImageModel, ConcreteImageModelSubclass])
+    assert descendants == [ConcreteImageModel, ConcreteImageModelSubclass]
diff --git a/tests/test_cachefiles.py b/tests/test_cachefiles.py
@@ -1,10 +1,11 @@
-import mock
+import pytest
+
+from unittest import mock
 from django.conf import settings
 from hashlib import md5
 from imagekit.cachefiles import ImageCacheFile, LazyImageCacheFile
 from imagekit.cachefiles.backends import Simple
 from imagekit.lib import force_bytes
-from nose.tools import raises, eq_
 from .imagegenerators import TestSpec
 from .utils import (assert_file_is_truthy, assert_file_is_falsy,
                     DummyAsyncCacheFileBackend, get_unique_image_file,
@@ -42,11 +43,11 @@ def test_async_backend_falsiness():
     assert_file_is_falsy(file)
 
 
-@raises(TestSpec.MissingSource)
 def test_no_source_error():
     spec = TestSpec(source=None)
     file = ImageCacheFile(spec)
-    file.generate()
+    with pytest.raises(TestSpec.MissingSource):
+        file.generate()
 
 
 def test_repr_does_not_send_existence_required():
@@ -71,7 +72,7 @@ def test_repr_does_not_send_existence_required():
             cachefile_backend=DummyAsyncCacheFileBackend()
         )
         file.__repr__()
-        eq_(signal.send.called, False)
+        assert signal.send.called is False
 
 
 def test_memcached_cache_key():
@@ -91,25 +92,24 @@ def __init__(self, name):
     length = 199 - extra_char_count
     filename = '1' * length
     file = MockFile(filename)
-    eq_(backend.get_key(file), '%s%s-state' %
-        (settings.IMAGEKIT_CACHE_PREFIX, file.name))
+    assert backend.get_key(file) == '%s%s-state' % (settings.IMAGEKIT_CACHE_PREFIX, file.name)
 
     length = 200 - extra_char_count
     filename = '1' * length
     file = MockFile(filename)
-    eq_(backend.get_key(file), '%s%s:%s' % (
+    assert backend.get_key(file) == '%s%s:%s' % (
         settings.IMAGEKIT_CACHE_PREFIX,
         '1' * (200 - len(':') - 32 - len(settings.IMAGEKIT_CACHE_PREFIX)),
-        md5(force_bytes('%s%s-state' % (settings.IMAGEKIT_CACHE_PREFIX, filename))).hexdigest()))
+        md5(force_bytes('%s%s-state' % (settings.IMAGEKIT_CACHE_PREFIX, filename))).hexdigest())
 
 
 def test_lazyfile_stringification():
     file = LazyImageCacheFile('testspec', source=None)
-    eq_(str(file), '')
-    eq_(repr(file), '<ImageCacheFile: None>')
+    assert str(file) == ''
+    assert repr(file) == '<ImageCacheFile: None>'
 
     source_file = get_image_file()
     file = LazyImageCacheFile('testspec', source=source_file)
     file.name = 'a.jpg'
-    eq_(str(file), 'a.jpg')
-    eq_(repr(file), '<ImageCacheFile: a.jpg>')
+    assert str(file) == 'a.jpg'
+    assert repr(file) == '<ImageCacheFile: a.jpg>'
diff --git a/tests/test_closing_fieldfiles.py b/tests/test_closing_fieldfiles.py
@@ -1,25 +1,27 @@
-from nose.tools import assert_false, assert_true
+import pytest
 
 from .models import Thumbnail
 from .utils import create_photo
 
 
+@pytest.mark.django_db(transaction=True)
 def test_do_not_leak_open_files():
     instance = create_photo('leak-test.jpg')
     source_file = instance.original_image
     # Ensure the FieldFile is closed before generation
     source_file.close()
     image_generator = Thumbnail(source=source_file)
     image_generator.generate()
-    assert_true(source_file.closed)
+    assert source_file.closed
 
 
+@pytest.mark.django_db(transaction=True)
 def test_do_not_close_open_files_after_generate():
     instance = create_photo('do-not-close-test.jpg')
     source_file = instance.original_image
     # Ensure the FieldFile is opened before generation
     source_file.open()
     image_generator = Thumbnail(source=source_file)
     image_generator.generate()
-    assert_false(source_file.closed)
+    assert not source_file.closed
     source_file.close()
diff --git a/tests/test_fields.py b/tests/test_fields.py
@@ -1,36 +1,40 @@
+import pytest
+
 from django import forms
 from django.core.files.base import File
 from django.core.files.uploadedfile import SimpleUploadedFile
 from imagekit import forms as ikforms
 from imagekit.processors import SmartCrop
-from nose.tools import eq_
 from . import imagegenerators  # noqa
 from .models import (ProcessedImageFieldModel,
                      ProcessedImageFieldWithSpecModel,
                      ImageModel)
 from .utils import get_image_file
 
 
+@pytest.mark.django_db(transaction=True)
 def test_model_processedimagefield():
     instance = ProcessedImageFieldModel()
     file = File(get_image_file())
     instance.processed.save('whatever.jpeg', file)
     instance.save()
 
-    eq_(instance.processed.width, 50)
-    eq_(instance.processed.height, 50)
+    assert instance.processed.width == 50
+    assert instance.processed.height == 50
 
 
+@pytest.mark.django_db(transaction=True)
 def test_model_processedimagefield_with_spec():
     instance = ProcessedImageFieldWithSpecModel()
     file = File(get_image_file())
     instance.processed.save('whatever.jpeg', file)
     instance.save()
 
-    eq_(instance.processed.width, 100)
-    eq_(instance.processed.height, 60)
+    assert instance.processed.width == 100
+    assert instance.processed.height == 60
 
 
+@pytest.mark.django_db(transaction=True)
 def test_form_processedimagefield():
     class TestForm(forms.ModelForm):
         image = ikforms.ProcessedImageField(spec_id='tests:testform_image',
@@ -45,5 +49,5 @@ class Meta:
     form = TestForm({}, file_dict)
     instance = form.save()
 
-    eq_(instance.image.width, 50)
-    eq_(instance.image.height, 50)
+    assert instance.image.width == 50
+    assert instance.image.height == 50
diff --git a/tests/test_generateimage_tag.py b/tests/test_generateimage_tag.py
@@ -1,5 +1,6 @@
+import pytest
+
 from django.template import TemplateSyntaxError
-from nose.tools import eq_, assert_false, raises, assert_not_equal
 from . import imagegenerators  # noqa
 from .utils import render_tag, get_html_attrs, clear_imagekit_cache
 
@@ -9,33 +10,33 @@ def test_img_tag():
     clear_imagekit_cache()
     attrs = get_html_attrs(ttag)
     expected_attrs = set(['src', 'width', 'height'])
-    eq_(set(attrs.keys()), expected_attrs)
+    assert set(attrs.keys()) == expected_attrs
     for k in expected_attrs:
-        assert_not_equal(attrs[k].strip(), '')
+        assert attrs[k].strip() != ''
 
 
 def test_img_tag_attrs():
     ttag = r"""{% generateimage 'testspec' source=img -- alt="Hello" %}"""
     clear_imagekit_cache()
     attrs = get_html_attrs(ttag)
-    eq_(attrs.get('alt'), 'Hello')
+    assert attrs.get('alt') == 'Hello'
 
 
-@raises(TemplateSyntaxError)
 def test_dangling_html_attrs_delimiter():
     ttag = r"""{% generateimage 'testspec' source=img -- %}"""
-    render_tag(ttag)
+    with pytest.raises(TemplateSyntaxError):
+        render_tag(ttag)
 
 
-@raises(TemplateSyntaxError)
 def test_html_attrs_assignment():
     """
     You can either use generateimage as an assignment tag or specify html attrs,
     but not both.
 
     """
     ttag = r"""{% generateimage 'testspec' source=img -- alt="Hello" as th %}"""
-    render_tag(ttag)
+    with pytest.raises(TemplateSyntaxError):
+        render_tag(ttag)
 
 
 def test_single_dimension_attr():
@@ -46,11 +47,11 @@ def test_single_dimension_attr():
     ttag = r"""{% generateimage 'testspec' source=img -- width="50" %}"""
     clear_imagekit_cache()
     attrs = get_html_attrs(ttag)
-    assert_false('height' in attrs)
+    assert 'height' not in attrs
 
 
 def test_assignment_tag():
     ttag = r"""{% generateimage 'testspec' source=img as th %}{{ th.url }}{{ th.height }}{{ th.width }}"""
     clear_imagekit_cache()
     html = render_tag(ttag)
-    assert_not_equal(html.strip(), '')
+    assert html.strip() != ''
diff --git a/tests/test_no_extra_queries.py b/tests/test_no_extra_queries.py
@@ -1,5 +1,4 @@
-from nose.tools import assert_false
-from mock import Mock, PropertyMock, patch
+from unittest.mock import Mock, PropertyMock, patch
 from .models import Photo
 
 
@@ -13,4 +12,4 @@ def test_dont_access_source():
     pmock.__get__ = Mock()
     with patch.object(Photo, 'original_image', pmock):
         photo = Photo()  # noqa
-        assert_false(pmock.__get__.called)
+        assert not pmock.__get__.called
diff --git a/tests/test_optimistic_strategy.py b/tests/test_optimistic_strategy.py
diff --git a/tests/test_serialization.py b/tests/test_serialization.py
diff --git a/tests/test_sourcegroups.py b/tests/test_sourcegroups.py
diff --git a/tests/test_thumbnail_tag.py b/tests/test_thumbnail_tag.py
diff --git a/tests/utils.py b/tests/utils.py
diff --git a/tox.ini b/tox.ini

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+[pytest]`
	`2`	`+django_find_project = false`
	`3`	`+DJANGO_SETTINGS_MODULE = tests.settings`