Changed directory structure of unittests

CHANGELOG.md

@@ -6,6 +6,11 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 
+## 2.1.0 - Unreleased
+### Changed
+* Changed directory structure of unittests
+
+
 ## 2.0.0 - 2019-08-06
 ## Added
 * Added `FlexQuery.call_bound()` method as a hook to preprocess custom arguments.

tests/django_flexquery_tests/models.py

@@ -1 +1,17 @@
-from .tests.test_flexquery import AModel
+from django.db import models
+
+from django_flexquery import *
+
+
+q_func = lambda self: Q(a=42)
+
+fq = FlexQuery.from_q(q_func)
+
+
+class QS(QuerySet):
+    fq = fq
+
+
+class AModel(models.Model):
+    objects = QS.as_manager()
+    a = models.IntegerField()

tests/django_flexquery_tests/tests/test_flexquery.py → tests/testsuite/test_flexquery.py

@@ -1,22 +1,8 @@
 from django.core.exceptions import ImproperlyConfigured
-from django.db import models
 from django.test import TestCase
 
 from django_flexquery import *
-
-
-q_func = lambda self: Q(a=42)
-
-fq = FlexQuery.from_q(q_func)
-
-
-class QS(QuerySet):
-    fq = fq
-
-
-class AModel(models.Model):
-    objects = QS.as_manager()
-    a = models.IntegerField()
+from django_flexquery_tests.models import *
 
 
 class FlexQueryTestCase(TestCase):

tox.ini

@@ -7,13 +7,13 @@ envlist =
 
 [testenv]
 commands =
-    coverage: coverage run tests/manage.py test -v 2 tests
+    coverage: coverage run tests/manage.py test -v 2 tests/testsuite
     coverage: coverage report -m
     coverage-report: coveralls
     docs: sphinx-build -EqW docs docs/_build
     lint: black --check -t py34 django_flexquery tests setup.py
     lint: pylint --rcfile=tox.ini django_flexquery
-    tests: python tests/manage.py test -v 2 tests
+    tests: python tests/manage.py test -v 2 tests/testsuite
 deps =
     django20: django ~= 2.0.0
     django21: django ~= 2.1.0