From 040f2272e0aec724a36e7abda445b61ee065a8f1 Mon Sep 17 00:00:00 2001 From: Jason Pellerin Date: Mon, 4 Dec 2006 19:58:49 +0000 Subject: [multi-db] Merged trunk to 3950. Some tests still failing. git-svn-id: http://code.djangoproject.com/svn/django/branches/multiple-db-support@4155 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- tests/regressiontests/thread_isolation/tests.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'tests/regressiontests/thread_isolation') diff --git a/tests/regressiontests/thread_isolation/tests.py b/tests/regressiontests/thread_isolation/tests.py index 39c141720a..96f40c4af5 100644 --- a/tests/regressiontests/thread_isolation/tests.py +++ b/tests/regressiontests/thread_isolation/tests.py @@ -147,7 +147,7 @@ class TestThreadIsolation(unittest.TestCase): finally: self.lock.release() - def request_one(self, path, request): + def request_one(self, request): """Start out with settings as originally configured""" from django.conf import settings debug("request_one: %s", settings.OTHER_DATABASES) @@ -169,7 +169,7 @@ class TestThreadIsolation(unittest.TestCase): self.assertEqual(connection.settings.DATABASE_NAME, settings.DATABASE_NAME) - def request_two(self, path, request): + def request_two(self, request): """Between the first and second requests, settings change to assign model MY to a different connection """ @@ -196,7 +196,7 @@ class TestThreadIsolation(unittest.TestCase): except: self.add_thread_error(sys.exc_info()) - def request_three(self, path, request): + def request_three(self, request): """Between the 2nd and 3rd requests, the settings at the names in OTHER_DATABASES have changed. """ -- cgit v1.3