Hackily converted tests to use django-sane-testing

--HG-- rename : djangohttpdigest/tests/__init__.py => testproject/tests/__init__.py rename : djangohttpdigest/tests/test_authentication.py => testproject/tests/test_authentication.py rename : djangohttpdigest/tests/test_digest.py => testproject/tests/test_digest.py rename : djangohttpdigest/tests/test_simple_digest.py => testproject/tests/test_simple_digest.py
Almad · Nov 11, 2009 · 859820b · 859820b
1 parent ea5bd8a
commit 859820b
Show file tree

Hide file tree

Showing 11 changed files with 9 additions and 119 deletions.
diff --git a/run_tests b/run_tests
diff --git a/testproject/config.py b/testproject/config.py
@@ -17,7 +17,8 @@
 MANAGERS = ADMINS
 
 DATABASE_ENGINE = "sqlite3"
-DATABASE_NAME = "/home/almad/tmp/httpdigesttest.db"
+DATABASE_NAME = "/tmp/httpdigesttest.db"
+TEST_DATABASE_NAME = "/tmp/httpdigesttest.db"
 DATABASE_USER = ""
 DATABASE_PASSWORD = ""
 DATABASE_HOST = "localhost"

diff --git a/testproject/djangohttpdigest b/testproject/djangohttpdigest
diff --git a/testproject/livetests.py b/testproject/livetests.py
diff --git a/testproject/server_runner.py b/testproject/server_runner.py
diff --git a/testproject/settings.py b/testproject/settings.py
@@ -19,10 +19,6 @@
 
 MIDDLEWARE_CLASSES = (
     'django.middleware.common.CommonMiddleware',
-    'django.contrib.sessions.middleware.SessionMiddleware',
-    'django.contrib.auth.middleware.AuthenticationMiddleware',
-    'django.middleware.transaction.TransactionMiddleware',
-    'django.middleware.http.SetRemoteAddrFromForwardedFor',
 )
 
 ROOT_URLCONF = 'testproject.urls'
@@ -41,11 +37,6 @@
 )
 
 INSTALLED_APPS = (
-    'django.contrib.auth',
-    'django.contrib.contenttypes',
-    'django.contrib.sessions',
-    'django.contrib.sites',
-    'django.contrib.admin',
     'testapi',
     # OK, this is not really installed, but we want our testsuite to eat it
     'djangohttpdigest',

diff --git a/testproject/testapi/views.py b/testproject/testapi/views.py
@@ -1,3 +1,4 @@
+from django.db.transaction import commit_on_success
 from django.http import HttpResponse
 from djangohttpdigest.decorators import protect_digest, protect_digest_model
 

diff --git a/djangohttpdigest/tests/__init__.py → testproject/tests/__init__.py b/djangohttpdigest/tests/__init__.py → testproject/tests/__init__.py
diff --git a/...gohttpdigest/tests/test_authentication.py → testproject/tests/test_authentication.py b/...gohttpdigest/tests/test_authentication.py → testproject/tests/test_authentication.py
diff --git a/djangohttpdigest/tests/test_digest.py → testproject/tests/test_digest.py b/djangohttpdigest/tests/test_digest.py → testproject/tests/test_digest.py
@@ -1,13 +1,10 @@
 import re
-import urllib2
-
-from django.test import TestCase
-from django.http import HttpRequest
-from django.core.handlers.wsgi import WSGIRequest
 
 from djangohttpdigest.digest import Digestor, parse_authorization_header
 
-class TestDigestor(TestCase):
+from djangosanetesting import UnitTestCase
+
+class TestDigestor(UnitTestCase):
     """ Test digestor, our wrapping class for handling digests """
 
     def setUp(self):
@@ -62,7 +59,7 @@ def test_bad_parsing_missing_digest(self):
         auth_string = 'username="rpgpedia", realm="extproject", nonce="1cc6ab869fca869c2c085d78a3729a66", uri="/extproject/project/fc8afe5e-da35-4fe2-a991-7b26c829cde5/user/rpgpedia/salt/", response="69ead146a246cd51bbd076244d2e455b", opaque="ToDoMoveThisToSettings", algorithm="MD5", qop=auth, nc=00000001, cnonce="a84f8e6cfcd50a75"'
         self.assertRaises(ValueError, lambda:self.digestor.parse_authorization_header(auth_string))
 
-class TestSimpleDigest(TestCase):
+class TestSimpleDigest(UnitTestCase):
 
     environment = {
         'HTTP_COOKIE':       '',

diff --git a/djangohttpdigest/tests/test_simple_digest.py → testproject/tests/test_simple_digest.py b/djangohttpdigest/tests/test_simple_digest.py → testproject/tests/test_simple_digest.py
@@ -1,13 +1,11 @@
 import urllib2
 import logging
 from md5 import md5
-from django.test import TestCase
-
 from djangohttpdigest.client import HttpDigestClient
 
-from module_test import LiveServerTestCase
+from djangosanetesting import HttpTestCase
 
-class TestSimpleDigest(LiveServerTestCase):
+class TestSimpleDigest(HttpTestCase):
     path = '/testapi/simpleprotected/'
     url = 'http://localhost:8000'