Changeset 418

Timestamp:

07/06/05 19:10:21

Author:

fumanchu

Message:

Added optional code-coverage run to CP, including test suite. Install Rees or Batchelder's coverage.py to use it.

Files:

• trunk/cherrypy/__init__.py (modified) (1 diff)
• trunk/cherrypy/server.py (modified) (4 diffs)
• trunk/cherrypy/test/test.py (modified) (4 diffs)

trunk/cherrypy/__init__.py

@@ -45 +45 @@
-_httpserver = None
-
+codecoverage = False
+
-try:
-    from threading import local

trunk/cherrypy/server.py

@@ -38 +38 @@
-import cherrypy
-from cherrypy import _cphttptools
-
+, covercp
-
-
@@ -68 +68 @@
-    """
-    
+    if cherrypy.codecoverage:
+        covercp.start()
+    
-    # Use a flag to indicate the state of the cherrypy application server.
-    # 0 = Not started
@@ -190 +193 @@
-    scheme: either "http" or "https"; defaults to "http"
-    """
-    
-    if cherrypy._appserver_state == 0:
-        raise cherrypy.NotReady("No thread has called cherrypy.server.start().")
@@ -198 +200 @@
-    threadID = threading._get_ident()
-    if threadID not in seen_threads:
+        
+        if cherrypy.codecoverage:
+            covercp.start()
+        
-        i = len(seen_threads) + 1
-        seen_threads[threadID] = i

trunk/cherrypy/test/test.py

@@ -125 +125 @@
-
-
+def report_coverage(coverage):
+    localDir = os.path.dirname(__file__)
+    curpath = os.path.normpath(os.path.join(os.getcwd(), localDir))
+    basedir = os.path.normpath(os.path.join(curpath, '../'))
+    
+    coverage.get_ready()
+    morfs = [x for x in coverage.cexecuted if x.startswith(basedir.lower())]
+    
+    total_statements = 0
+    total_executed = 0
+    
+    print
+    print "CODE COVERAGE (this might take a while)",
+    for morf in morfs:
+        sys.stdout.write(".")
+        sys.stdout.flush()
+        name = os.path.split(morf)[1]
+        try:
+            _, statements, _, missing, readable  = coverage.analysis2(morf)
+            n = len(statements)
+            m = n - len(missing)
+            total_statements = total_statements + n
+            total_executed = total_executed + m
+        except KeyboardInterrupt:
+            raise
+        except:
+            pass
+    
+    pc = 100.0
+    if total_statements > 0:
+        pc = 100.0 * total_executed / total_statements
+    
+    print ("\nTotal: %s Covered: %s Percent: %2d%%"
+           % (total_statements, total_executed, pc))
+
+
+def run_test_suite(moduleNames, server, conf):
+    cherrypy.config.update({'global': conf.copy()})
+    helper.startServer(server)
+    for testmod in moduleNames:
+        # Must run each module in a separate suite,
+        # because each module uses/overwrites cherrypy globals.
+        cherrypy.config.reset()
+        cherrypy.config.update({'global': conf.copy()})
+        cherrypy._cputil._cpInitDefaultFilters()
+        suite = CPTestLoader.loadTestsFromName(testmod)
+        CPTestRunner(verbosity=2).run(suite)
+    helper.stopServer()
+
+
-def main():
-    # Place our current directory's parent (cherrypy/) at the beginning
@@ -132 +182 @@
-    sys.path.insert(0, os.path.normpath(os.path.join(curpath, '../../')))
-    
+    # Start the coverage tool before importing cherrypy, so module-level
+    # global statements are covered.
+    try:
+        from coverage import the_coverage as coverage
+        coverage.cache_default = os.path.join(os.path.dirname(__file__),
+                                              "../lib/coverage.cache")
+        coverage.start()
+    except ImportError:
+        coverage = None
+    
+    global cherrypy, helper
-    print "Python version used to run this test script:", sys.version.split()[0]
-    try:
-        import cherrypy
+        from cherrypy.test import helper
-    except ImportError:
-        print "Error: couldn't find CherryPy !"
@@ -140 +202 @@
-    print "CherryPy version", cherrypy.__version__
-    print
-    
-    import cherrypy
-    from cherrypy.test import helper
-    
-    class NotReadyTest(unittest.TestCase):
@@ -170 +229 @@
-                   'server.logToScreen': False,
-                   'server.environment': "production",
-                   'profiling.on': True,
-                   }
-    
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    raw_input('hit enter')
-