merge from master async db stuff fixes

1 files changed, 0 insertions, 32 deletions

diff --git a/funcweb/funcweb/tests/test_controllers.py b/funcweb/funcweb/tests/test_controllers.py
deleted file mode 100644
index 3c26c58..0000000
--- a/funcweb/funcweb/tests/test_controllers.py
+++ /dev/null
@@ -1,32 +0,0 @@
-import unittest
-import turbogears
-from turbogears import testutil
-from funcweb.controllers import Root
-import cherrypy
-
-cherrypy.root = Root()
-
-class TestPages(unittest.TestCase):
-
-    def setUp(self):
-        turbogears.startup.startTurboGears()
-
-    def tearDown(self):
-        """Tests for apps using identity need to stop CP/TG after each test to
-        stop the VisitManager thread. 
-        See http://trac.turbogears.org/turbogears/ticket/1217 for details.
-        """
-        turbogears.startup.stopTurboGears()
-
-    def test_method(self):
-        "the index method should return a string called now"
-        import types
-        result = testutil.call(cherrypy.root.index)
-        assert type(result["now"]) == types.StringType
-
-    def test_indextitle(self):
-        "The indexpage should have the right title"
-        testutil.createRequest("/")
-        response = cherrypy.response.body[0].lower() 
-        assert "<title>welcome to turbogears</title>" in response
-