Switch test execution method

jwhitlock · jwhitlock · commit 59cfb4dd85a7 · 2015-12-28T15:21:05.000-06:00
Switch to the test execution suggested by Django 1.9 docs.
diff --git a/runtests.py b/runtests.py
@@ -0,0 +1,40 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+# Based on:
+# https://docs.djangoproject.com/en/1.9/topics/testing/advanced
+# Using the Django test runner to test reusable applications
+
+import os
+import logging
+import sys
+
+import django
+from django.conf import settings
+from django.test.utils import get_runner
+
+if __name__ == "__main__":
+    os.environ['DJANGO_SETTINGS_MODULE'] = 'tests.settings'
+    django.setup()
+
+    # Log memcache errors to console
+    from django_pylibmc.memcached import log
+    handler = logging.StreamHandler()
+    handler.setLevel(logging.DEBUG)
+    log.addHandler(handler)
+
+    # Test that the cache is working at all
+    from django.core.cache import cache
+    assert cache
+    test_val = 'The test passed'
+    assert cache.set('test', test_val), "Could not set cache value"
+    cache_val = cache.get('test')
+    assert cache_val == test_val, "Could not get from cache"
+
+    # Ignore memcache errors during tests
+    handler.setLevel(logging.CRITICAL)
+
+    # Run the tests
+    TestRunner = get_runner(settings)
+    test_runner = TestRunner()
+    failures = test_runner.run_tests(["tests"])
+    sys.exit(bool(failures))
diff --git a/tests/__init__.py b/tests/__init__.py
@@ -0,0 +1 @@
+# Tests for django-pylibmc
diff --git a/tests/app/__init__.py b/tests/app/__init__.py
diff --git a/tests/models.py b/tests/models.py
diff --git a/tests/settings.py b/tests/settings.py
@@ -7,7 +7,7 @@
 }
 
 INSTALLED_APPS = (
-    'app',
+    'tests',
 )
 
 CACHES = {
@@ -44,3 +44,19 @@
     'django.contrib.messages.middleware.MessageMiddleware',
     'django.middleware.clickjacking.XFrameOptionsMiddleware',
 )
+
+LOGGING = {
+    'version': 1,
+    'disable_existing_loggers': False,
+    'handlers': {
+        'console': {
+            'class': 'logging.StreamHandler',
+        },
+    },
+    'loggers': {
+        'django': {
+            'handlers': ['console'],
+            'level': 'CRITICAL'
+        }
+    }
+}
diff --git a/tests/tests.py b/tests/tests.py
@@ -1,32 +1,9 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
-import os
-import logging
-import sys
 import time
-import unittest
-
-
-test_dir = os.path.dirname(os.path.abspath(__file__))
-sys.path.append(os.path.join(test_dir, os.path.pardir))
-os.environ['DJANGO_SETTINGS_MODULE'] = 'settings'
-
-try:
-    from django.test.runner import DiscoverRunner as Runner
-except ImportError:
-    # Django 1.5 and below
-    from django.test.simple import DjangoTestSuiteRunner as Runner
-
-from app.models import Poll, expensive_calculation
-
-try:
-    from django import setup
-except ImportError:
-    # Django 1.6 and below does not require setup
-    setup = lambda: None
-else:
-    assert setup
+from django.test import TestCase
 
+from .models import Poll, expensive_calculation
 
 # functions/classes for complex data type tests
 def f():
@@ -51,7 +28,7 @@ def load_cache(name):
 
 # Lifted originally from django/regressiontests/cache/tests.py.
 # In Django 1.8 (and earlier), tests are in tests/cache/tests.py.
-class PylibmcCacheTests(unittest.TestCase):
+class PylibmcCacheTests(TestCase):
     cache_name = 'default'
 
     def setUp(self):
@@ -326,33 +303,3 @@ class PylibmcCacheWithBinaryTests(PylibmcCacheTests):
 
 class PylibmcCacheWithOptionsTests(PylibmcCacheTests):
     cache_name = 'with_options'
-
-
-if __name__ == '__main__':
-    # Initialize app in Django 1.7 and above
-    setup()
-
-    # Log memcache errors to console
-    from django_pylibmc.memcached import log
-    handler = logging.StreamHandler()
-    handler.setLevel(logging.DEBUG)
-    log.addHandler(handler)
-
-    # Test that the cache is working at all
-    from django.core.cache import cache
-    assert cache
-    test_val = 'The test passed'
-    assert cache.set('test', test_val), "Could not set cache value"
-    cache_val = cache.get('test')
-    assert cache_val == test_val, "Could not get from cache"
-
-    # Ignore memcache errors during tests
-    handler.setLevel(logging.CRITICAL)
-
-    # Run the tests
-    runner = Runner()
-    try:
-        old_config = runner.setup_databases()
-        unittest.main()
-    finally:
-        runner.teardown_databases(old_config)
diff --git a/tox.ini b/tox.ini
@@ -9,7 +9,7 @@ envlist =
     py{27,34,35}-django-master,
 
 [testenv]
-commands = {envpython} tests/tests.py
+commands = {envpython} runtests.py
 deps =
     django18: Django>=1.8,<1.9
     django19: Django>=1.9,<1.10
