pytest (#336)

* pytest

* a few more tests

* a few more tests

Author: Peter Bengtsson

.gitignore

@@ -22,3 +22,4 @@ tags
 podcasts
 minimalcss/yarn-error.log
 .vscode/
+.pytest_cache/

bin/travis/test.sh

@@ -5,4 +5,4 @@ set -e
 # Make sure we're running ES 5
 curl -v http://localhost:9200/
 
-python manage.py test --noinput
+pytest peterbecom

constraints.txt

@@ -0,0 +1,19 @@
+py==1.5.4 \
+    --hash=sha256:3fd59af7435864e1a243790d322d763925431213b6b8529c6ca71081ace3bbf7 \
+    --hash=sha256:e31fb2767eb657cbde86c454f02e99cb846d3cd9d61b318525140214fdc0e98e
+pathlib2==2.3.2 \
+    --hash=sha256:8eb170f8d0d61825e09a95b38be068299ddeda82f35e96c3301a8a5e7604cb83 \
+    --hash=sha256:d1aa2a11ba7b8f7b21ab852b1fb5afb277e1bb99d5dfc663380b5015c0d80c5a
+pluggy==0.7.1 \
+    --hash=sha256:6e3836e39f4d36ae72840833db137f7b7d35105079aee6ec4a62d9f80d594dd1 \
+    --hash=sha256:95eb8364a4708392bae89035f45341871286a333f749c3141c20573d2b3876e1
+more-itertools==4.3.0 \
+    --hash=sha256:c187a73da93e7a8acc0001572aebc7e3c69daf7bf6881a2cea10650bd4420092 \
+    --hash=sha256:c476b5d3a34e12d40130bc2f935028b5f636df8f372dc2c1c01dc19681b2039e \
+    --hash=sha256:fcbfeaea0be121980e15bc97b3817b5202ca73d0eae185b4550cbfce2a3ebb3d
+atomicwrites==1.1.5 \
+    --hash=sha256:240831ea22da9ab882b551b31d4225591e5e447a68c5e188db5b89ca1d487585 \
+    --hash=sha256:a24da68318b08ac9c9c45029f4a10371ab5b20e4226738e150e6e7c571630ae6
+attrs==18.1.0 \
+    --hash=sha256:4b90b09eeeb9b88c35bc642cbac057e45a5fd85367b985bd2809c62b7b939265 \
+    --hash=sha256:e0d0eb91441a3b53dab4d9b743eafc1ac44476296a2053b6ca3af0b139faf87b

peterbecom/base/test_fscache.py

@@ -0,0 +1,52 @@
+import os
+
+from django import http
+from django.test import RequestFactory
+from django.contrib.auth.models import AnonymousUser, User
+
+from peterbecom.base import fscache
+
+
+def test_path_to_fs_path(tmpfscacheroot):
+    assert fscache.path_to_fs_path("/foo/bar") == tmpfscacheroot + "/foo/bar/index.html"
+
+
+def test_create_parents(tmpfscacheroot):
+    fs_path = fscache.path_to_fs_path("/foo/bar")
+    fscache.create_parents(fs_path)
+    assert os.path.isdir(os.path.dirname(fs_path))
+
+
+def test_cache_request():
+    request = RequestFactory().get("/")
+    request.user = AnonymousUser()
+    response = http.HttpResponse()
+    assert fscache.cache_request(request, response)
+
+    response = http.HttpResponse(status=404)
+    assert not fscache.cache_request(request, response)
+
+    request = RequestFactory().get("/", {"foo": "bar"})
+    response = http.HttpResponse()
+    assert not fscache.cache_request(request, response)
+
+    request = RequestFactory().get("/plog/edit/")
+    request.user = AnonymousUser()
+    response = http.HttpResponse()
+    assert not fscache.cache_request(request, response)
+
+    request = RequestFactory().get("/")
+    request.user = User()
+    response = http.HttpResponse()
+    assert not fscache.cache_request(request, response)
+
+    request = RequestFactory().get("/plog/post/ping")
+    request.user = AnonymousUser()
+    response = http.HttpResponse()
+    assert not fscache.cache_request(request, response)
+
+    request = RequestFactory().get("/")
+    request.user = AnonymousUser()
+    request._fscache_disable = True
+    response = http.HttpResponse()
+    assert not fscache.cache_request(request, response)

peterbecom/conftest.py

@@ -0,0 +1,10 @@
+import tempfile
+
+import pytest
+
+
+@pytest.fixture
+def tmpfscacheroot(settings):
+    with tempfile.TemporaryDirectory() as tmpdir:
+        settings.FSCACHE_ROOT = tmpdir
+        yield tmpdir

peterbecom/plog/gfm.py

@@ -40,66 +40,3 @@ def pre_insert_callback(matchobj):
     text = re.sub(r"{gfm-extraction-([0-9a-f]{32})\}", pre_insert_callback, text)
 
     return text
-
-
-# Test suite.
-try:
-    from nose.tools import assert_equal
-except ImportError:
-
-    def assert_equal(a, b):
-        assert a == b, "%r != %r" % (a, b)
-
-
-def test_single_underscores():
-    """Don't touch single underscores inside words."""
-    assert_equal(gfm("foo_bar"), "foo_bar")
-
-
-def test_underscores_code_blocks():
-    """Don't touch underscores in code blocks."""
-    assert_equal(gfm("    foo_bar_baz"), "    foo_bar_baz")
-
-
-def test_underscores_pre_blocks():
-    """Don't touch underscores in pre blocks."""
-    assert_equal(gfm("<pre>\nfoo_bar_baz\n</pre>"), "\n\n<pre>\nfoo_bar_baz\n</pre>")
-
-
-def test_pre_block_pre_text():
-    """Don't treat pre blocks with pre-text differently."""
-    a = "\n\n<pre>\nthis is `a\\_test` and this\\_too\n</pre>"
-    b = "hmm<pre>\nthis is `a\\_test` and this\\_too\n</pre>"
-    assert_equal(gfm(a)[2:], gfm(b)[3:])
-
-
-def test_two_underscores():
-    """Escape two or more underscores inside words."""
-    assert_equal(gfm("foo_bar_baz"), "foo\\_bar\\_baz")
-
-
-def test_newlines_simple():
-    """Turn newlines into br tags in simple cases."""
-    assert_equal(gfm("foo\nbar"), "foo  \nbar")
-
-
-def test_newlines_group():
-    """Convert newlines in all groups."""
-    assert_equal(
-        gfm("apple\npear\norange\n\nruby\npython\nerlang"),
-        "apple  \npear  \norange\n\nruby  \npython  \nerlang",
-    )
-
-
-def test_newlines_long_group():
-    """Convert newlines in even long groups."""
-    assert_equal(
-        gfm("apple\npear\norange\nbanana\n\nruby\npython\nerlang"),
-        "apple  \npear  \norange  \nbanana\n\nruby  \npython  \nerlang",
-    )
-
-
-def test_newlines_list():
-    """Don't convert newlines in lists."""
-    assert_equal(gfm("# foo\n# bar"), "# foo\n# bar")
-    assert_equal(gfm("* foo\n* bar"), "* foo\n* bar")

peterbecom/plog/test_gfm.py

@@ -0,0 +1,55 @@
+from peterbecom.plog.gfm import gfm
+
+
+def test_single_underscores():
+    """Don't touch single underscores inside words."""
+    assert gfm("foo_bar") == "foo_bar"
+
+
+def test_underscores_code_blocks():
+    """Don't touch underscores in code blocks."""
+    assert gfm("    foo_bar_baz") == "    foo_bar_baz"
+
+
+def test_underscores_pre_blocks():
+    """Don't touch underscores in pre blocks."""
+    assert gfm("<pre>\nfoo_bar_baz\n</pre>") == "\n\n<pre>\nfoo_bar_baz\n</pre>"
+
+
+def test_pre_block_pre_text():
+    """Don't treat pre blocks with pre-text differently."""
+    a = "\n\n<pre>\nthis is `a\\_test` and this\\_too\n</pre>"
+    b = "hmm<pre>\nthis is `a\\_test` and this\\_too\n</pre>"
+    assert gfm(a)[2:] == gfm(b)[3:]
+
+
+def test_two_underscores():
+    """Escape two or more underscores inside words."""
+    assert gfm("foo_bar_baz") == "foo\\_bar\\_baz"
+
+
+def test_newlines_simple():
+    """Turn newlines into br tags in simple cases."""
+    assert gfm("foo\nbar") == "foo  \nbar"
+
+
+def test_newlines_group():
+    """Convert newlines in all groups."""
+    assert (
+        gfm("apple\npear\norange\n\nruby\npython\nerlang")
+        == "apple  \npear  \norange\n\nruby  \npython  \nerlang"
+    )
+
+
+def test_newlines_long_group():
+    """Convert newlines in even long groups."""
+    assert (
+        gfm("apple\npear\norange\nbanana\n\nruby\npython\nerlang")
+        == "apple  \npear  \norange  \nbanana\n\nruby  \npython  \nerlang"
+    )
+
+
+def test_newlines_list():
+    """Don't convert newlines in lists."""
+    assert gfm("# foo\n# bar") == "# foo\n# bar"
+    assert gfm("* foo\n* bar") == "* foo\n* bar"

peterbecom/plog/tests.py

@@ -45,7 +45,7 @@ def mocked_render(*a, **k):
         try:
             response = self.client.get(url)
             content = response.content.decode("utf-8")
-            self.assertTrue(blog.title in content)
+            assert blog.title in content
             assert "0 comments" in content
             response = self.client.get(url)
             content = response.content.decode("utf-8")
@@ -90,23 +90,23 @@ def test_blog_post_with_comment_approval(self):
         # but it hasn't been approved yet
         response = anonymous.get(url)
         content = response.content.decode("utf-8")
-        self.assertEqual(response.status_code, 200)
-        self.assertTrue("COMMENTX" not in content)
+        assert response.status_code == 200
+        assert "COMMENTX" not in content
 
         # let's approve it!
         approve_url = reverse("approve_comment", args=[blog.oid, comment.oid])
         response = loggedin.post(approve_url, HTTP_X_REQUESTED_WITH="XMLHttpRequest")
-        self.assertEqual(response.status_code, 403)
+        assert response.status_code == 403
         key = OneTimeAuthKey.objects.create(blogitem=blog, blogcomment=comment).key
         response = loggedin.get(
             approve_url + "?key={}".format(key), HTTP_X_REQUESTED_WITH="XMLHttpRequest"
         )
-        self.assertEqual(response.status_code, 200)
-        self.assertEqual(response.content.decode("utf-8"), "OK")
+        assert response.status_code == 200
+        assert response.content.decode("utf-8") == "OK"
 
         response = anonymous.get(url)
-        self.assertEqual(response.status_code, 200)
-        self.assertTrue("COMMENTX" in str(response.content))
+        assert response.status_code == 200
+        assert "COMMENTX" in str(response.content)
 
     def test_preview_post(self):
         cat = Category.objects.create(name="MyCategory")
@@ -120,12 +120,12 @@ def test_preview_post(self):
             "categories[]": str(cat.pk),
         }
         response = self.client.post(url, data)
-        self.assertEqual(response.status_code, 200)
-        # self.assertTrue('Some <script> TITLE' in response.content)
+        assert response.status_code == 200
+        # assert 'Some <script> TITLE' in response.content
         content = response.content.decode("utf-8")
-        self.assertTrue("This is<br" in content)
-        self.assertTrue("<em>great</em>" in content)
-        self.assertTrue("<code>verbatim</code>" in content)
+        assert "This is<br" in content
+        assert "<em>great</em>" in content
+        assert "<code>verbatim</code>" in content
 
         data[
             "text"
@@ -140,8 +140,8 @@ def foo():
 
         response = self.client.post(url, data)
         content = response.content.decode("utf-8")
-        self.assertTrue('<div class="highlight">' in content)
-        self.assertTrue('<span class="k">def</span>' in content)
+        assert '<div class="highlight">' in content
+        assert '<span class="k">def</span>' in content
 
     def test_old_redirects(self):
         blog = BlogItem.objects.create(
@@ -159,6 +159,6 @@ def test_old_redirects(self):
         assert response.status_code == 200
 
         response = self.client.get(url, {"replypath": "foo"})
-        self.assertEqual(response.status_code, 301)
-        self.assertEqual(urlparse(response["location"]).path, url)
-        self.assertTrue(not urlparse(response["location"]).query)
+        assert response.status_code == 301
+        assert urlparse(response["location"]).path == url
+        assert not urlparse(response["location"]).query

peterbecom/settings/__init__.py

@@ -1,21 +1,2 @@
-import sys
-
 from .base import *  # NOQA
 from .local import *  # NOQA
-
-
-if len(sys.argv) > 1 and sys.argv[1] == "test":
-    # Shuts up excessive logging when running tests
-    # import logging
-    # logging.disable(logging.WARNING)
-
-    from .test import *  # NOQA
-
-    # # Are you getting full benefit from django-nose?
-    # if not os.getenv('REUSE_DB', 'false').lower() in ('true', '1', ''):
-    #     print (
-    #         "Note!\n\tIf you want much faster tests in local development "
-    #         "consider setting the REUSE_DB=1 environment variable.\n"
-    #     )
-else:
-    from .local import *

peterbecom/settings/test.py

@@ -2,7 +2,7 @@
 import tempfile
 
 from django.http import Http404
-
+from peterbecom.settings import *  # noqa
 
 CELERY_ALWAYS_EAGER = True
 CELERY_EAGER_PROPAGATES_EXCEPTIONS = True
@@ -12,6 +12,8 @@
 
 ES_INDEX = "test_peterbecom"
 
+REDIS_URL = "redis://localhost:6379/9"
+
 
 ROLLBAR = {
     "enabled": False,

pytest.ini

@@ -0,0 +1,6 @@
+[pytest]
+DJANGO_SETTINGS_MODULE = peterbecom.settings.test
+norecursedirs = .git .* frontend docs htmlcov .cache
+addopts = -rsxX --showlocals --tb=native --no-migrations
+testpaths = peterbecom
+python_files = tests.py test_*.py *_tests.py

requirements.txt

@@ -1,3 +1,5 @@
+-c constraints.txt
+
 Django==2.1 \
     --hash=sha256:ea50d85709708621d956187c6b61d9f9ce155007b496dd914fdb35db8d790aec \
     --hash=sha256:7f246078d5a546f63c28fc03ce71f4d7a23677ce42109219c24c9ffb28416137
@@ -88,16 +90,9 @@ Unidecode==1.0.22 \
 requests==2.19.1 \
     --hash=sha256:63b52e3c866428a224f97cab011de738c36aec0185aa91cfacd418b5d58911d1 \
     --hash=sha256:ec22d826a36ed72a7358ff3fe56cbd4ba69dd7a6718ffd450ff0e9df7a47ce6a
-django-nose==1.4.5 \
-    --hash=sha256:5df2df802c607daeeab8ac1e93abf54508ed6133eb93852310f512000124b4a5 \
-    --hash=sha256:87663f18cb25f01d56c84ac1ff8a0e6e6a6246264b2549b751cb239d0642e76a
 six==1.11.0 \
     --hash=sha256:832dc0e10feb1aa2c68dcc57dbb658f1c7e65b9b61af69048abc87a2db00a0eb \
     --hash=sha256:70e8a77beed4562e7f14fe23a786b54f6296e34344c23bc42f07b15018ff98e9
-nose==1.3.7 \
-    --hash=sha256:dadcddc0aefbf99eea214e0f1232b94f2fa9bd98fa8353711dacb112bfcbbb2a \
-    --hash=sha256:9ff7c6cc443f8c51994b34a667bbcf45afd6d945be7477b52e97516fd17c53ac \
-    --hash=sha256:f1bffef9cbc82628f6e7d7b40d7e255aefaa1adb6a1b1d26c69a8b79e6208a98
 amqp==2.3.2 \
     --hash=sha256:073dd02fdd73041bffc913b767866015147b61f2a9bc104daef172fc1a0066eb \
     --hash=sha256:eed41946890cd43e8dee44a316b85cf6fee5a1a34bb4a562b660a358eb529e1b
@@ -416,3 +411,9 @@ zopfli==0.1.4 \
     --hash=sha256:df7f84a01c0d8c8936e764e63fd0478aa526dc405ee2ad437e633b28cf824141 \
     --hash=sha256:ea204478f5dd4b7c03ec8a25ac5512f5cd85b15e001724289d1676a52c4c1633 \
     --hash=sha256:f5d7840833608f1be3a5f928dbcc0a5ff45ebd8040ea6177864f61a72b773423
+pytest==3.7.2 \
+    --hash=sha256:3459a123ad5532852d36f6f4501dfe1acf4af1dd9541834a164666aa40395b02 \
+    --hash=sha256:96bfd45dbe863b447a3054145cd78a9d7f31475d2bce6111b133c0cc4f305118
+pytest-django==3.4.2 \
+    --hash=sha256:2d2e0a618d91c280d463e90bcbea9b4e417609157f611a79685b1c561c4c0836 \
+    --hash=sha256:59683def396923b78d7e191a7086a48193f8d5db869ace79acb38f906522bc7b