Changeset 4584

Timestamp:

05/15/08 12:05:08 (6 months ago)

Author:

kskuhlman

Message:

Fixed problems in test suite where some modules were relying on requests to be created as a side-effect of other test modules. (They failed when tested standalone).

test_sqlobject.test_redirection:

cherrypy.HTTPRedirect isn't available outside of a request. Monkey-patched in a dummy request that doesn't have this dependancy as a fix. The other possibility would have been to switch the test over to be more of a functional test, creating a request & bringing the whole stack into test, but since the rest of test_sqlobject is a functional test, I decided to keep the style intact.

test_view.test_UnicodeValueAppearingInATemplateIsFine, and
test_view.test_default_output_encoding:

view.base.render sets the response header, which is impossible outside of a request. Added a setup method in test_view.TestView? to create dummy request & response objects. The dummy response object is a new (trivial) addition to testutil.

Discovered these while working on #1762.

Files:

• branches/1.1/turbogears/tests/test_sqlobject.py (modified) (4 diffs)
• branches/1.1/turbogears/tests/test_view.py (modified) (1 diff)
• branches/1.1/turbogears/testutil.py (modified) (1 diff)

branches/1.1/turbogears/tests/test_sqlobject.py

@@ -1 +1 @@
-"""Tests for SQLObject database operations"""
-
-
+, testutil
-from sqlobject import dbconnection
-import cherrypy
@@ -37 +37 @@
-    finally:
-        database.hub_registry.clear()
+
+
+class DummyRedirect(Exception):
+    pass
-
-
@@ -101 +105 @@
-    dsi = DatabaseStandIn()
-    database.hub_registry.add(dsi)
+    #The real cherrypy redirect is only available within a request,
+    # so monkey-patch in this dummy.
+    _http_redirect = cherrypy.HTTPRedirect
+    cherrypy.HTTPRedirect = DummyRedirect
-    try:
-        try:
@@ -111 +119 @@
-    finally:
-        database.hub_registry.clear()
+        cherrypy.HTTPRedirect = _http_redirect
-
-

branches/1.1/turbogears/tests/test_view.py

@@ -1 +1 @@
-# -*- coding: utf-8 -*-
-
-
+
+
-import unittest
-
-class TestView(unittest.TestCase):
+
+    def setUp(self):
+        testutil.start_cp()
+        cherrypy.serving.request = testutil.DummyRequest()
+        cherrypy.serving.response = testutil.DummyResponse()
-
-    def test_cycle(self):

branches/1.1/turbogears/testutil.py

@@ -137 +137 @@
-
-
+class DummyResponse:
+    """A very simple dummy response."""
+    headers = {}
+
+
-def call(method, *args, **kw):
-    start_cp()