Ticket #1721: turbogears-sqlalchemy-0.4-rollback-test.patch

TurboGears-1.0.4.3/turbogears/tests/test_sqlalchemy.py

@@ -158 +158 @@
-    doerr = errorhandling.exception_handler(handerr)(doerr)
-    doerr = expose()(doerr)
-
+    def handexc(self, id):
+        Person(id=id)
+        try:
+            Person(id=id)
+        except:
+            pass
+    handexc = expose()(handexc)
+
-def test_exc_rollback():
-    cherrypy.root = RbRoot()
-    create_request('/doerr?id=24')
@@ -172 +180 @@
-    print cherrypy.response.body[0]
-    assert cherrypy.response.body[0] == '{"tg_flash": null}'
-
+# Check that if the controller method catches a db exception, we don't still
+# raise an exception
+def test_exc_caught_rollback():
+    cherrypy.root = RbRoot()
+    create_request('/handexc?id=27')
+    output = cherrypy.response.body[0]
+    print output
+    assert '<title>500 Internal error</title>' not in output
+
-#--
-# Check for session freshness, ticket #1419
-# It checks that changes made to the data in thread B are reflected in thread A.