Changeset 1392

Timestamp:

10/08/06 00:20:04

Author:

fumanchu

Message:

Final fix for #481 (buildbot). The test suite now exits with a non-zero code if any of the tests fail. See http://groups.google.com/group/cherrypy-devel/msg/e5c25c23484432d3

Files:

• trunk/cherrypy/test/helper.py (modified) (2 diffs)
• trunk/cherrypy/test/test.py (modified) (5 diffs)

trunk/cherrypy/test/helper.py

@@ -109 +109 @@
-    setConfig(conf)
-    cherrypy.server.quickstart(server)
+    # The Pybots automatic testing system needs the suite to exit
+    # with a non-zero value if there were any problems.
+    # Might as well stick it in the engine... :/
+    cherrypy.engine.test_success = True
-    cherrypy.engine.start_with_callback(_run_test_suite_thread,
-                                        args=(moduleNames, conf))
+    if cherrypy.engine.test_success:
+        return 0
+    else:
+        return 1
-
-def sync_apps(profile=False, validate=False):
@@ -150 +158 @@
-        
-        suite = CPTestLoader.loadTestsFromName(testmod)
-
+
+
-        
-        teardown = getattr(m, "teardown_server", None)

trunk/cherrypy/test/test.py

@@ -61 +61 @@
-            baseconf['server.ssl_certificate'] = serverpem
-            baseconf['server.ssl_private_key'] = serverpem
-
+return 
-    
-    def _run(self, conf):
@@ -79 +79 @@
-        print
-        print "Running tests:", self.server
-
+return 
-
-
@@ -313 +313 @@
-                            self.port, self.scheme, self.interactive)
-        
-
+success = 
-        
-        if self.profile:
@@ -322 +322 @@
-        if self.cover:
-            self.stop_coverage()
+        
+        return success
-
-
@@ -358 +360 @@
-    ]
-    clp = CommandLineParser(testList)
-
+success = 
-    if clp.interactive:
-        print
-        raw_input('hit enter')
+    sys.exit(success)
-
-