From 994531a1c248812008f698a7c2f6cfb7eddf2170 Mon Sep 17 00:00:00 2001
From: Albert Tugushev <albert@tugushev.ru>
Date: Fri, 1 Jan 2016 11:39:44 +0300
Subject: [PATCH] Add new test runner

Also move test.py file to tests directory
---
 linaro_django_pagination/tests/__init__.py    |  0
 linaro_django_pagination/tests/runner.py      | 36 +++++++++++++++++++
 .../{tests.py => tests/test_main.py}          | 14 ++++----
 setup.py                                      | 10 ++----
 4 files changed, 46 insertions(+), 14 deletions(-)
 create mode 100644 linaro_django_pagination/tests/__init__.py
 create mode 100755 linaro_django_pagination/tests/runner.py
 rename linaro_django_pagination/{tests.py => tests/test_main.py} (96%)

diff --git a/linaro_django_pagination/tests/__init__.py b/linaro_django_pagination/tests/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/linaro_django_pagination/tests/runner.py b/linaro_django_pagination/tests/runner.py
new file mode 100755
index 0000000..44c6f69
--- /dev/null
+++ b/linaro_django_pagination/tests/runner.py
@@ -0,0 +1,36 @@
+#!/usr/bin/env python
+import django
+import doctest
+import sys
+
+from django.conf import settings
+
+
+def runtests():
+    if not settings.configured:
+        # Configure test environment
+        settings.configure(
+            SECRET_KEY='fake-key',
+            INSTALLED_APPS=(
+                'linaro_django_pagination',
+            ),
+        )
+
+    try:
+        django.setup()
+    except AttributeError:  # for Django 1.6 compatible
+        pass
+
+    from django.test.utils import get_runner
+
+    TestRunner = get_runner(settings)
+    test_runner = TestRunner()
+    failures = test_runner.run_tests(
+        ["linaro_django_pagination.tests"],
+        extra_tests=[doctest.DocTestSuite('linaro_django_pagination.tests.test_main')]
+    )
+    sys.exit(bool(failures))
+
+
+if __name__ == '__main__':
+    runtests()
diff --git a/linaro_django_pagination/tests.py b/linaro_django_pagination/tests/test_main.py
similarity index 96%
rename from linaro_django_pagination/tests.py
rename to linaro_django_pagination/tests/test_main.py
index 90468d5..ba1baa1 100644
--- a/linaro_django_pagination/tests.py
+++ b/linaro_django_pagination/tests/test_main.py
@@ -170,30 +170,30 @@
 >>> class HttpRequest(DjangoHttpRequest):
 ...     page = lambda self, suffix: 1
 
->>> t.render(Context({'var': range(21), 'request': HttpRequest()}))
+>>> t.render(Context({'var': range(21), 'request': HttpRequest()})) #doctest: +ELLIPSIS
 u'\\n...\\n...<div class="pagination">...
 >>>
 >>> t = Template("{% load pagination_tags %}{% autopaginate var %}{% paginate %}")
->>> t.render(Context({'var': range(21), 'request': HttpRequest()}))
+>>> t.render(Context({'var': range(21), 'request': HttpRequest()})) #doctest: +ELLIPSIS
 u'\\n...\\n...<div class="pagination">...
 >>> t = Template("{% load pagination_tags %}{% autopaginate var 20 %}{% paginate %}")
->>> t.render(Context({'var': range(21), 'request': HttpRequest()}))
+>>> t.render(Context({'var': range(21), 'request': HttpRequest()})) #doctest: +ELLIPSIS
 u'\\n...\\n...<div class="pagination">...
 >>> t = Template("{% load pagination_tags %}{% autopaginate var by %}{% paginate %}")
->>> t.render(Context({'var': range(21), 'by': 20, 'request': HttpRequest()}))
+>>> t.render(Context({'var': range(21), 'by': 20, 'request': HttpRequest()})) #doctest: +ELLIPSIS
 u'\\n...\\n...<div class="pagination">...<a href="?page=2"...
 >>> t = Template("{% load pagination_tags %}{% autopaginate var by as foo %}{{ foo }}")
 >>> t.render(Context({'var': range(21), 'by': 20, 'request': HttpRequest()}))
 u'[0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19]'
 >>>
 >>> t = Template("{% load pagination_tags %}{% autopaginate var2 by as foo2 %}{% paginate %}{% autopaginate var by as foo %}{% paginate %}")
->>> t.render(Context({'var': range(21), 'var2': range(50, 121), 'by': 20, 'request': HttpRequest()}))
+>>> t.render(Context({'var': range(21), 'var2': range(50, 121), 'by': 20, 'request': HttpRequest()})) #doctest: +ELLIPSIS
 u'\\n...\\n...<div class="pagination">...<a href="?page_var2=2"...<a href="?page_var=2"...
 >>>
 
 # Testing InfinitePaginator
 
->>> from paginator import InfinitePaginator
+>>> from linaro_django_pagination.paginator import InfinitePaginator
 
 >>> InfinitePaginator
 <class 'linaro_django_pagination.paginator.InfinitePaginator'>
@@ -222,7 +222,7 @@ False
 
 # Testing FinitePaginator
 
->>> from paginator import FinitePaginator
+>>> from linaro_django_pagination.paginator import FinitePaginator
 
 >>> FinitePaginator
 <class 'linaro_django_pagination.paginator.FinitePaginator'>
diff --git a/setup.py b/setup.py
index 0fb6f20..0a9781e 100755
--- a/setup.py
+++ b/setup.py
@@ -29,8 +29,10 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+import os
 from setuptools import setup, find_packages
 
+os.environ['DJANGO_SETTINGS_MODULE'] = 'linaro_django_pagination.tests.settings'
 
 setup(
     name='linaro-django-pagination',
@@ -42,7 +44,7 @@ setup(
     long_description=open("README.rst").read(),
     keywords='pagination,django',
     url='https://github.com/zyga/django-pagination',
-    test_suite='linaro_django_pagination.test_project.tests.run_tests',
+    test_suite="linaro_django_pagination.tests.runner.runtests",
     license='BSD',
     packages=find_packages(),
     classifiers=[
@@ -57,12 +59,6 @@ setup(
         "Programming Language :: Python :: 3",
         "Programming Language :: Python :: 3.3",
     ],
-    install_requires=[
-        'django >= 1.2',
-    ],
-    tests_require=[
-        'django-testproject >= 0.1',
-    ],
     setup_requires=[
         'versiontools >= 1.3.1'
     ],
-- 
2.20.1