code coverage: replace figleaf with coverage.py, should work on py2.6 now.

[tahoe-lafs/tahoe-lafs.git] / twisted / plugins / allmydata_trial.py

diff --git a/twisted/plugins/allmydata_trial.py b/twisted/plugins/allmydata_trial.py
index 275bbb24d1154218518347ea8d256d61ba251d30..11cbeade52e41619347f946240c1332615f33a80 100644 (file)
--- a/twisted/plugins/allmydata_trial.py
+++ b/twisted/plugins/allmydata_trial.py
@@ -4,18 +4,18 @@ from zope.interface import implements
 from twisted.trial.itrial import IReporter
 from twisted.plugin import IPlugin
 
-# register a plugin that can create our FigleafReporter. The reporter itself
-# lives in a separate place
-
-# note that this .py file is *not* in a package: there is no __init__.py in
-# our parent directory. This is important, because otherwise ours would fight
-# with Twisted's. When trial looks for plugins, it merely executes all the
-# *.py files it finds in any twisted/plugins/ subdirectories of anything on
-# sys.path . The namespace that results from executing these .py files is
-# examined for instances which provide both IPlugin and the target interface
-# (in this case, trial is looking for IReporter instances). Each such
-# instance tells the application how to create a plugin by naming the module
-# and class that should be instantiated.
+# register a plugin that can create our CoverageReporter. The reporter itself
+# lives separately, in src/allmydata/test/trial_figleaf.py
+
+# note that this allmydata_trial.py file is *not* in a package: there is no
+# __init__.py in our parent directory. This is important, because otherwise
+# ours would fight with Twisted's. When trial looks for plugins, it merely
+# executes all the *.py files it finds in any twisted/plugins/ subdirectories
+# of anything on sys.path . The namespace that results from executing these
+# .py files is examined for instances which provide both IPlugin and the
+# target interface (in this case, trial is looking for IReporter instances).
+# Each such instance tells the application how to create a plugin by naming
+# the module and class that should be instantiated.
 
 # When installing our package via setup.py, arrange for this file to be
 # installed to the system-wide twisted/plugins/ directory.
@@ -32,17 +32,10 @@ class _Reporter(object):
         self.klass = klass
 
 
-fig = _Reporter("Figleaf Code-Coverage Reporter",
-                "allmydata.test.trial_figleaf",
-                description="verbose color output (with figleaf coverage)",
-                longOpt="verbose-figleaf",
-                shortOpt="f",
-                klass="FigleafReporter")
-
-bwfig = _Reporter("Figleaf Code-Coverage Reporter (colorless)",
-                  "allmydata.test.trial_figleaf",
-                  description="Colorless verbose output (with figleaf coverage)",
-                  longOpt="bwverbose-figleaf",
+bwcov = _Reporter("Code-Coverage Reporter (colorless)",
+                  "allmydata.test.trial_coverage",
+                  description="Colorless verbose output (with 'coverage' coverage)",
+                  longOpt="bwverbose-coverage",
                   shortOpt=None,
-                  klass="FigleafTextReporter")
+                  klass="CoverageTextReporter")