tests: Move unit tests to unit module

Signed-off-by: Stephen Finucane <stephen@that.guru>

diff --git a/patchwork/tests/__init__.py b/patchwork/tests/__init__.py
index 0f1369c56172dc6e2c88abc36260164f9cff3bb6..b5be2dbc673c4ba438693eacad5db616a1728b1d 100644 (file)
--- a/patchwork/tests/__init__.py
+++ b/patchwork/tests/__init__.py
@@ -9,6 +9,7 @@ import warnings
 TEST_MAIL_DIR = os.path.join(os.path.dirname(__file__), 'mail')
 TEST_PATCH_DIR = os.path.join(os.path.dirname(__file__), 'patches')
 TEST_FUZZ_DIR = os.path.join(os.path.dirname(__file__), 'fuzztests')
+TEST_SERIES_DIR = os.path.join(os.path.dirname(__file__), 'series')
 
 # configure warnings
 

diff --git a/patchwork/tests/api/__init__.py b/patchwork/tests/unit/__init__.py
similarity index 100%
rename from patchwork/tests/api/__init__.py
rename to patchwork/tests/unit/__init__.py

diff --git a/patchwork/tests/views/__init__.py b/patchwork/tests/unit/api/__init__.py
similarity index 100%
rename from patchwork/tests/views/__init__.py
rename to patchwork/tests/unit/api/__init__.py

diff --git a/patchwork/tests/api/test_bundle.py b/patchwork/tests/unit/api/test_bundle.py
similarity index 99%
rename from patchwork/tests/api/test_bundle.py
rename to patchwork/tests/unit/api/test_bundle.py
index dbfea2b684aa39e5378c7b945abc03adabce839d..0537945188f50a1b677180a32440b1e9336ea124 100644 (file)
--- a/patchwork/tests/api/test_bundle.py
+++ b/patchwork/tests/unit/api/test_bundle.py
@@ -9,7 +9,7 @@ from django.urls import reverse
 from rest_framework import status
 
 from patchwork.models import Bundle
-from patchwork.tests.api import utils
+from patchwork.tests.unit.api import utils
 from patchwork.tests.utils import create_bundle
 from patchwork.tests.utils import create_maintainer
 from patchwork.tests.utils import create_patch

diff --git a/patchwork/tests/api/test_check.py b/patchwork/tests/unit/api/test_check.py
similarity index 99%
rename from patchwork/tests/api/test_check.py
rename to patchwork/tests/unit/api/test_check.py
index ffca64d5c9e7a293cf960fb0dad3d576a8255030..a49971753d8981d1e0e23de97360eca8ff22064f 100644 (file)
--- a/patchwork/tests/api/test_check.py
+++ b/patchwork/tests/unit/api/test_check.py
@@ -8,7 +8,7 @@ from django.urls import reverse
 from rest_framework import status
 
 from patchwork.models import Check
-from patchwork.tests.api import utils
+from patchwork.tests.unit.api import utils
 from patchwork.tests.utils import create_check
 from patchwork.tests.utils import create_patch
 from patchwork.tests.utils import create_maintainer

diff --git a/patchwork/tests/api/test_comment.py b/patchwork/tests/unit/api/test_comment.py
similarity index 99%
rename from patchwork/tests/api/test_comment.py
rename to patchwork/tests/unit/api/test_comment.py
index 3487bf4aeb4b99d4526b3d8d0f0b017a89e6b313..1cfbcef48fdf68beadd2add1da75ebab65f77dcf 100644 (file)
--- a/patchwork/tests/api/test_comment.py
+++ b/patchwork/tests/unit/api/test_comment.py
@@ -10,7 +10,7 @@ from rest_framework import status
 
 from patchwork.models import PatchComment
 from patchwork.models import CoverComment
-from patchwork.tests.api import utils
+from patchwork.tests.unit.api import utils
 from patchwork.tests.utils import create_cover
 from patchwork.tests.utils import create_cover_comment
 from patchwork.tests.utils import create_patch

diff --git a/patchwork/tests/api/test_cover.py b/patchwork/tests/unit/api/test_cover.py
similarity index 99%
rename from patchwork/tests/api/test_cover.py
rename to patchwork/tests/unit/api/test_cover.py
index 5869469ede72fe604d48e38da7489b16fb924848..643806d92b6db038865735fb620a54bca2aaada2 100644 (file)
--- a/patchwork/tests/api/test_cover.py
+++ b/patchwork/tests/unit/api/test_cover.py
@@ -10,7 +10,7 @@ from django.urls import NoReverseMatch
 from django.urls import reverse
 from rest_framework import status
 
-from patchwork.tests.api import utils
+from patchwork.tests.unit.api import utils
 from patchwork.tests.utils import create_cover
 from patchwork.tests.utils import create_covers
 from patchwork.tests.utils import create_maintainer

diff --git a/patchwork/tests/api/test_event.py b/patchwork/tests/unit/api/test_event.py
similarity index 99%
rename from patchwork/tests/api/test_event.py
rename to patchwork/tests/unit/api/test_event.py
index 890d449c17dd6f1697661569f4db91d4a0322b5b..735111a27017841917f053442d0f4d31aa07544f 100644 (file)
--- a/patchwork/tests/api/test_event.py
+++ b/patchwork/tests/unit/api/test_event.py
@@ -8,7 +8,7 @@ from django.urls import reverse
 from rest_framework import status
 
 from patchwork.models import Event
-from patchwork.tests.api import utils
+from patchwork.tests.unit.api import utils
 from patchwork.tests.utils import create_check
 from patchwork.tests.utils import create_cover
 from patchwork.tests.utils import create_cover_comment

diff --git a/patchwork/tests/api/test_patch.py b/patchwork/tests/unit/api/test_patch.py
similarity index 99%
rename from patchwork/tests/api/test_patch.py
rename to patchwork/tests/unit/api/test_patch.py
index 2661d75cb133e239d3f9bc9fa3df8fa15ebac841..b2890c224987cf8c7236ac172fa102e2af02c153 100644 (file)
--- a/patchwork/tests/api/test_patch.py
+++ b/patchwork/tests/unit/api/test_patch.py
@@ -12,7 +12,7 @@ from django.urls import reverse
 from rest_framework import status
 
 from patchwork.models import Patch
-from patchwork.tests.api import utils
+from patchwork.tests.unit.api import utils
 from patchwork.tests.utils import create_maintainer
 from patchwork.tests.utils import create_patch
 from patchwork.tests.utils import create_patches

diff --git a/patchwork/tests/api/test_person.py b/patchwork/tests/unit/api/test_person.py
similarity index 99%
rename from patchwork/tests/api/test_person.py
rename to patchwork/tests/unit/api/test_person.py
index a79e99358d8126218025df36044408c8e9968ae0..3286f03dc70c4cb794c93e5b7613451737b197ff 100644 (file)
--- a/patchwork/tests/api/test_person.py
+++ b/patchwork/tests/unit/api/test_person.py
@@ -8,7 +8,7 @@ from django.urls import NoReverseMatch
 from django.urls import reverse
 from rest_framework import status
 
-from patchwork.tests.api import utils
+from patchwork.tests.unit.api import utils
 from patchwork.tests.utils import create_maintainer
 from patchwork.tests.utils import create_person
 from patchwork.tests.utils import create_user

diff --git a/patchwork/tests/api/test_project.py b/patchwork/tests/unit/api/test_project.py
similarity index 99%
rename from patchwork/tests/api/test_project.py
rename to patchwork/tests/unit/api/test_project.py
index c66c538d1eabf7d3a5a9796896355bfcfe332626..1bc8c2a403aa7dd382ecb304c583b3cae64522fa 100644 (file)
--- a/patchwork/tests/api/test_project.py
+++ b/patchwork/tests/unit/api/test_project.py
@@ -8,7 +8,7 @@ from django.urls import reverse
 from rest_framework import status
 
 from patchwork.models import Project
-from patchwork.tests.api import utils
+from patchwork.tests.unit.api import utils
 from patchwork.tests.utils import create_maintainer
 from patchwork.tests.utils import create_project
 from patchwork.tests.utils import create_user

diff --git a/patchwork/tests/api/test_relation.py b/patchwork/tests/unit/api/test_relation.py
similarity index 99%
rename from patchwork/tests/api/test_relation.py
rename to patchwork/tests/unit/api/test_relation.py
index 5a4e86290ec9f933393d8491c59b0aea5f4df4f3..67d95b98bdec0629a914f4d41285f9cabf353c6b 100644 (file)
--- a/patchwork/tests/api/test_relation.py
+++ b/patchwork/tests/unit/api/test_relation.py
@@ -9,7 +9,7 @@ from rest_framework import status
 
 from patchwork.models import Patch
 from patchwork.models import PatchRelation
-from patchwork.tests.api import utils
+from patchwork.tests.unit.api import utils
 from patchwork.tests.utils import create_maintainer
 from patchwork.tests.utils import create_patch
 from patchwork.tests.utils import create_patches

diff --git a/patchwork/tests/api/test_series.py b/patchwork/tests/unit/api/test_series.py
similarity index 99%
rename from patchwork/tests/api/test_series.py
rename to patchwork/tests/unit/api/test_series.py
index 24d7d9a6899ce1ec174739a5459613065efd6571..80887d48d3b51e97709c73627129e568f90f15c7 100644 (file)
--- a/patchwork/tests/api/test_series.py
+++ b/patchwork/tests/unit/api/test_series.py
@@ -8,7 +8,7 @@ from django.urls import NoReverseMatch
 from django.urls import reverse
 from rest_framework import status
 
-from patchwork.tests.api import utils
+from patchwork.tests.unit.api import utils
 from patchwork.tests.utils import create_cover
 from patchwork.tests.utils import create_maintainer
 from patchwork.tests.utils import create_patch

diff --git a/patchwork/tests/api/test_user.py b/patchwork/tests/unit/api/test_user.py
similarity index 99%
rename from patchwork/tests/api/test_user.py
rename to patchwork/tests/unit/api/test_user.py
index 501680525e1055d1aecd5b1f35a790347340416c..e5488c3d230f6e03350ef43c2d581381cefe105e 100644 (file)
--- a/patchwork/tests/api/test_user.py
+++ b/patchwork/tests/unit/api/test_user.py
@@ -8,7 +8,7 @@ from django.urls import NoReverseMatch
 from django.urls import reverse
 from rest_framework import status
 
-from patchwork.tests.api import utils
+from patchwork.tests.unit.api import utils
 from patchwork.tests.utils import create_maintainer
 from patchwork.tests.utils import create_user
 

diff --git a/patchwork/tests/api/utils.py b/patchwork/tests/unit/api/utils.py
similarity index 99%
rename from patchwork/tests/api/utils.py
rename to patchwork/tests/unit/api/utils.py
index 09269f50bc77d8d6df66432566f5f406bef7fefd..cd9935a4d484299ece835ae6179fd13fa102ddba 100644 (file)
--- a/patchwork/tests/api/utils.py
+++ b/patchwork/tests/unit/api/utils.py
@@ -12,7 +12,7 @@ from rest_framework.authtoken.models import Token
 from rest_framework.test import APIClient as BaseAPIClient
 from rest_framework.test import APIRequestFactory
 
-from patchwork.tests.api import validator
+from patchwork.tests.unit.api import validator
 from patchwork.tests.utils import create_user
 
 
@@ -22,6 +22,7 @@ OUT_DIR = os.path.join(
     os.pardir,
     os.pardir,
     os.pardir,
+    os.pardir,
     'docs',
     'api',
     'samples',

diff --git a/patchwork/tests/api/validator.py b/patchwork/tests/unit/api/validator.py
similarity index 99%
rename from patchwork/tests/api/validator.py
rename to patchwork/tests/unit/api/validator.py
index f7617e453688370f8da7efc487c71690adcdbac8..b64e8f2823d332c723459bcfcd91bde29d889fa0 100644 (file)
--- a/patchwork/tests/api/validator.py
+++ b/patchwork/tests/unit/api/validator.py
@@ -23,6 +23,7 @@ SCHEMAS_DIR = os.path.join(
     os.pardir,
     os.pardir,
     os.pardir,
+    os.pardir,
     'docs',
     'api',
     'schemas',

diff --git a/patchwork/tests/test_checks.py b/patchwork/tests/unit/test_checks.py
similarity index 100%
rename from patchwork/tests/test_checks.py
rename to patchwork/tests/unit/test_checks.py

diff --git a/patchwork/tests/test_expiry.py b/patchwork/tests/unit/test_expiry.py
similarity index 100%
rename from patchwork/tests/test_expiry.py
rename to patchwork/tests/unit/test_expiry.py

diff --git a/patchwork/tests/test_fields.py b/patchwork/tests/unit/test_fields.py
similarity index 100%
rename from patchwork/tests/test_fields.py
rename to patchwork/tests/unit/test_fields.py

diff --git a/patchwork/tests/test_management.py b/patchwork/tests/unit/test_management.py
similarity index 100%
rename from patchwork/tests/test_management.py
rename to patchwork/tests/unit/test_management.py

diff --git a/patchwork/tests/test_notifications.py b/patchwork/tests/unit/test_notifications.py
similarity index 100%
rename from patchwork/tests/test_notifications.py
rename to patchwork/tests/unit/test_notifications.py

diff --git a/patchwork/tests/test_paginator.py b/patchwork/tests/unit/test_paginator.py
similarity index 100%
rename from patchwork/tests/test_paginator.py
rename to patchwork/tests/unit/test_paginator.py

diff --git a/patchwork/tests/test_parser.py b/patchwork/tests/unit/test_parser.py
similarity index 100%
rename from patchwork/tests/test_parser.py
rename to patchwork/tests/unit/test_parser.py

diff --git a/patchwork/tests/test_series.py b/patchwork/tests/unit/test_series.py
similarity index 99%
rename from patchwork/tests/test_series.py
rename to patchwork/tests/unit/test_series.py
index e5f60e3ae62c48d46edfc90d3e2099d0fe73d477..cce754893155731140777e5809e68f4eefb9733d 100644 (file)
--- a/patchwork/tests/test_series.py
+++ b/patchwork/tests/unit/test_series.py
@@ -12,13 +12,11 @@ from django.test import TestCase
 
 from patchwork import models
 from patchwork import parser
+from patchwork.tests import TEST_SERIES_DIR
 from patchwork.tests import utils
 from patchwork.views.utils import patch_to_mbox
 
 
-TEST_SERIES_DIR = os.path.join(os.path.dirname(__file__), 'series')
-
-
 class _BaseTestCase(TestCase):
     def setUp(self):
         utils.create_state()

diff --git a/patchwork/tests/test_signals.py b/patchwork/tests/unit/test_signals.py
similarity index 100%
rename from patchwork/tests/test_signals.py
rename to patchwork/tests/unit/test_signals.py

diff --git a/patchwork/tests/test_tags.py b/patchwork/tests/unit/test_tags.py
similarity index 100%
rename from patchwork/tests/test_tags.py
rename to patchwork/tests/unit/test_tags.py

diff --git a/patchwork/tests/test_version.py b/patchwork/tests/unit/test_version.py
similarity index 100%
rename from patchwork/tests/test_version.py
rename to patchwork/tests/unit/test_version.py

diff --git a/patchwork/tests/unit/views/__init__.py b/patchwork/tests/unit/views/__init__.py
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/patchwork/tests/views/test_about.py b/patchwork/tests/unit/views/test_about.py
similarity index 100%
rename from patchwork/tests/views/test_about.py
rename to patchwork/tests/unit/views/test_about.py

diff --git a/patchwork/tests/views/test_api.py b/patchwork/tests/unit/views/test_api.py
similarity index 100%
rename from patchwork/tests/views/test_api.py
rename to patchwork/tests/unit/views/test_api.py

diff --git a/patchwork/tests/views/test_bundles.py b/patchwork/tests/unit/views/test_bundles.py
similarity index 100%
rename from patchwork/tests/views/test_bundles.py
rename to patchwork/tests/unit/views/test_bundles.py

diff --git a/patchwork/tests/views/test_cover.py b/patchwork/tests/unit/views/test_cover.py
similarity index 100%
rename from patchwork/tests/views/test_cover.py
rename to patchwork/tests/unit/views/test_cover.py

diff --git a/patchwork/tests/views/test_mail.py b/patchwork/tests/unit/views/test_mail.py
similarity index 100%
rename from patchwork/tests/views/test_mail.py
rename to patchwork/tests/unit/views/test_mail.py

diff --git a/patchwork/tests/views/test_patch.py b/patchwork/tests/unit/views/test_patch.py
similarity index 100%
rename from patchwork/tests/views/test_patch.py
rename to patchwork/tests/unit/views/test_patch.py

diff --git a/patchwork/tests/views/test_projects.py b/patchwork/tests/unit/views/test_projects.py
similarity index 100%
rename from patchwork/tests/views/test_projects.py
rename to patchwork/tests/unit/views/test_projects.py

diff --git a/patchwork/tests/views/test_pwclient.py b/patchwork/tests/unit/views/test_pwclient.py
similarity index 100%
rename from patchwork/tests/views/test_pwclient.py
rename to patchwork/tests/unit/views/test_pwclient.py

diff --git a/patchwork/tests/views/test_user.py b/patchwork/tests/unit/views/test_user.py
similarity index 100%
rename from patchwork/tests/views/test_user.py
rename to patchwork/tests/unit/views/test_user.py

diff --git a/patchwork/tests/views/test_utils.py b/patchwork/tests/unit/views/test_utils.py
similarity index 100%
rename from patchwork/tests/views/test_utils.py
rename to patchwork/tests/unit/views/test_utils.py

diff --git a/patchwork/tests/views/test_xmlrpc.py b/patchwork/tests/unit/views/test_xmlrpc.py
similarity index 100%
rename from patchwork/tests/views/test_xmlrpc.py
rename to patchwork/tests/unit/views/test_xmlrpc.py

diff --git a/tox.ini b/tox.ini
index 5fe0e7539e9612fe7962490affcb3cfffe2d521a..721b8be8d13e775c41ffe1253353b727cee9a85b 100644 (file)
--- a/tox.ini
+++ b/tox.ini
@@ -31,7 +31,7 @@ passenv =
     DATABASE_NAME
     DJANGO_TEST_PROCESSES
 commands =
-    python {toxinidir}/manage.py test --noinput --parallel -v 2 --timing -- {posargs:patchwork}
+    python {toxinidir}/manage.py test --noinput --parallel -v 2 --timing -- {posargs:patchwork.tests.unit}
 
 [testenv:pep8]
 deps =
@@ -64,8 +64,8 @@ setenv =
     DJANGO_SETTINGS_MODULE = patchwork.settings.dev
 commands =
     coverage erase
-    coverage run --omit=*tox*,patchwork/tests/*.py,manage.py,patchwork/migrations/*.py \
-         --branch {toxinidir}/manage.py test --noinput patchwork
+    coverage run --omit=*tox*,patchwork/tests/unit/*.py,manage.py,patchwork/migrations/*.py \
+         --branch {toxinidir}/manage.py test --noinput patchwork.tests.unit
     coverage report -m
 
 [gh-actions]