From b8584897498c8ff2480b68c5e4ade405e8a5227a Mon Sep 17 00:00:00 2001
From: Craig Bruce <craig@eyesopen.com>
Date: Mon, 8 Sep 2014 17:45:36 -0600
Subject: [PATCH] added tox file and updated test files to work with Django 1.7

---
 README.rst     |  9 +++++
 sockettests.py |  9 ++++-
 tcptests.py    |  8 +++++
 tox.ini        | 92 ++++++++++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 117 insertions(+), 1 deletion(-)
 create mode 100644 tox.ini

diff --git a/README.rst b/README.rst
index d13cfb89..eda0edfb 100644
--- a/README.rst
+++ b/README.rst
@@ -116,7 +116,16 @@ On Django >= 1.3::
         },
     }
 
+Tests
+-----
+
+A real redis server is required to test this package, then run tox to test against supported versions::
+
+    $ redis-server --unixsocket /tmp/redis.sock --requirepass yadayada
+    $ tox
+
 .. _redis: http://redis.io
 .. _redis-py: http://github.com/andymccurdy/redis-py/
 .. _hiredis: https://github.com/pietern/hiredis-py
 
+
diff --git a/sockettests.py b/sockettests.py
index 57479456..9fbc61eb 100755
--- a/sockettests.py
+++ b/sockettests.py
@@ -20,16 +20,23 @@
             'LOCATION': '/tmp/redis.sock',
             'OPTIONS': {
                 'DB': 15,
-                'PASSWORD': 'yadayada',
                 'PARSER_CLASS': 'redis.connection.HiredisParser'
             },
         },
     },
+    'MIDDLEWARE_CLASSES': ('django.middleware.common.CommonMiddleware',
+                           'django.middleware.csrf.CsrfViewMiddleware'),
 }
 
 if not settings.configured:
     settings.configure(**cache_settings)
 
+import django
+try:
+    django.setup()
+except AttributeError:
+    pass
+
 from django.test.simple import DjangoTestSuiteRunner
 
 def runtests(*test_args):
diff --git a/tcptests.py b/tcptests.py
index 45237f72..c3361220 100755
--- a/tcptests.py
+++ b/tcptests.py
@@ -28,12 +28,20 @@
             },
         },
     },
+    'MIDDLEWARE_CLASSES': ('django.middleware.common.CommonMiddleware',
+                           'django.middleware.csrf.CsrfViewMiddleware'),
 }
 
 
 if not settings.configured:
     settings.configure(**cache_settings)
 
+import django
+try:
+    django.setup()
+except AttributeError:
+    pass
+
 from django.test.simple import DjangoTestSuiteRunner
 
 def runtests(*test_args):
diff --git a/tox.ini b/tox.ini
new file mode 100644
index 00000000..b75b73e6
--- /dev/null
+++ b/tox.ini
@@ -0,0 +1,92 @@
+[tox]
+envlist =
+    py26-django14, py26-django15, py26-django16,
+    py27-django14, py27-django15, py27-django16, py27-django17,
+    py33-django15, py33-django16, py33-django17,
+
+[testenv]
+downloadcache = {toxworkdir}/cache/
+commands=
+    python sockettests.py
+    python tcptests.py
+deps =
+    redis>=2.4.5
+    hiredis
+
+[testenv:py26-django14]
+basepython = python2.6
+deps =
+    Django<1.5
+    {[testenv]deps}
+
+[testenv:py26-django15]
+basepython = python2.6
+deps =
+    Django<1.6
+    {[testenv]deps}
+
+[testenv:py26-django16]
+basepython = python2.6
+deps =
+    Django<1.7
+    {[testenv]deps}
+
+[testenv:py27-django14]
+basepython = python2.7
+deps =
+    Django<1.5
+    {[testenv]deps}
+
+[testenv:py27-django15]
+basepython = python2.7
+deps =
+    Django<1.6
+    {[testenv]deps}
+
+[testenv:py27-django16]
+basepython = python2.7
+deps =
+    Django<1.7
+    {[testenv]deps}
+
+[testenv:py27-django17]
+basepython = python2.7
+deps =
+    Django<1.8
+    {[testenv]deps}
+
+[testenv:py33-django15]
+basepython = python3.3
+deps =
+    Django<1.6
+    {[testenv]deps}
+
+[testenv:py33-django16]
+basepython = python3.3
+deps =
+    Django<1.7
+    {[testenv]deps}
+
+[testenv:py33-django17]
+basepython = python3.3
+deps =
+    Django<1.8
+    {[testenv]deps}
+
+[testenv:py34-django15]
+basepython = python3.4
+deps =
+    Django<1.6
+    {[testenv]deps}
+
+[testenv:py34-django16]
+basepython = python3.4
+deps =
+    Django<1.7
+    {[testenv]deps}
+
+[testenv:py34-django17]
+basepython = python3.4
+deps =
+    Django<1.8
+    {[testenv]deps}
\ No newline at end of file