Changeset 2315

Timestamp:

12/28/06 07:16:52 (2 years ago)

Author:

alberto

Message:

Manually merging 2313:2314 from 1.0

Files:

• trunk/turbogears/qstemplates/quickstart/+package+/tests/test_controllers.py_tmpl (modified) (2 diffs)

trunk/turbogears/qstemplates/quickstart/+package+/tests/test_controllers.py_tmpl

@@ +1 @@
+#if $identity != "none"
+import turbogears
+from nose import with_setup
+#end if
-from turbogears import testutil
-from ${package}.controllers import Root
-import cherrypy
+
+#if $identity != "none"
+def teardown_func():
+    """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()
+#end if
-
-cherrypy.root = Root()
@@ -10 +23 @@
-    result = testutil.call(cherrypy.root.index)
-    assert type(result["now"]) == types.StringType
+#if $identity != "none"
+test_method = with_setup(teardown=teardown_func)(test_method)
+#end if
-
-def test_indextitle():
-main
+index
-    testutil.createRequest("/")
-    assert "<title>Welcome to TurboGears</title>" in cherrypy.response.body[0]
+#if $identity != "none"
+test_indextitle = with_setup(teardown=teardown_func)(test_indextitle)
+#end if
+
+#if $identity != "none"
+def test_logintitle():
+    "login page should have the right title"
+    testutil.createRequest("/login")
+    assert "<title>Login</title>" in cherrypy.response.body[0]
+test_logintitle = with_setup(teardown=teardown_func)(test_logintitle)
+#end if