diff options
| -rw-r--r-- | coverage/annotate.py | 8 | ||||
| -rw-r--r-- | coverage/cmdline.py | 32 | ||||
| -rw-r--r-- | coverage/codeunit.py | 12 | ||||
| -rw-r--r-- | coverage/config.py | 38 | ||||
| -rw-r--r-- | coverage/control.py | 58 | ||||
| -rw-r--r-- | coverage/html.py | 8 | ||||
| -rw-r--r-- | coverage/report.py | 16 | ||||
| -rw-r--r-- | coverage/summary.py | 8 | ||||
| -rw-r--r-- | coverage/xmlreport.py | 8 | ||||
| -rw-r--r-- | test/test_cmdline.py | 58 |
10 files changed, 123 insertions, 123 deletions
diff --git a/coverage/annotate.py b/coverage/annotate.py index 9c2c7a0a..b53ae03d 100644 --- a/coverage/annotate.py +++ b/coverage/annotate.py @@ -33,15 +33,15 @@ class AnnotateReporter(Reporter): blank_re = re.compile(r"\s*(#|$)") else_re = re.compile(r"\s*else\s*:\s*(#|$)") - def report(self, morfs, directory=None, omit_prefixes=None, require_prefixes=None): + def report(self, morfs, directory=None, omit_prefixes=None, include_prefixes=None): """Run the report. `omit_prefixes` is a list of prefixes. CodeUnits that match those prefixes will be omitted from the list. - `require_prefixes` is a list of prefixes. Only CodeUnits that match those prefixes + `include_prefixes` is a list of prefixes. Only CodeUnits that match those prefixes will be included in the list. - You are required to pass at most one of `omit_prefixes` and `require_prefixes`. + You are required to pass at most one of `omit_prefixes` and `include_prefixes`. """ - self.report_files(self.annotate_file, morfs, directory, omit_prefixes, require_prefixes) + self.report_files(self.annotate_file, morfs, directory, omit_prefixes, include_prefixes) def annotate_file(self, cu, analysis): """Annotate a single file. diff --git a/coverage/cmdline.py b/coverage/cmdline.py index acf8903d..700b1e18 100644 --- a/coverage/cmdline.py +++ b/coverage/cmdline.py @@ -32,6 +32,12 @@ class Opts(object): '-i', '--ignore-errors', action='store_true', help="Ignore errors while reading source files." ) + include = optparse.Option( + '', '--include', action='store', + metavar="PRE1,PRE2,...", + help="Include files only when their filename path starts with one of these " + "prefixes." + ) pylib = optparse.Option( '-L', '--pylib', action='store_true', help="Measure coverage even inside the Python installed library, " @@ -54,12 +60,6 @@ class Opts(object): help="Omit files when their filename path starts with one of these " "prefixes." ) - require = optparse.Option( - '', '--require', action='store', - metavar="PRE1,PRE2,...", - help="Include files only when their filename path starts with one of these " - "prefixes." - ) output_xml = optparse.Option( '-o', '', action='store', dest="outfile", metavar="OUTFILE", @@ -104,8 +104,8 @@ class CoverageOptionParser(optparse.OptionParser, object): directory=None, help=None, ignore_errors=None, + include=None, omit=None, - require=None, parallel_mode=None, pylib=None, rcfile=True, @@ -226,7 +226,7 @@ CMDS = { Opts.directory, Opts.ignore_errors, Opts.omit, - Opts.require, + Opts.include, ] + GLOBAL_ARGS, usage = "[options] [modules]", description = "Make annotated copies of the given files, marking " @@ -264,7 +264,7 @@ CMDS = { Opts.directory, Opts.ignore_errors, Opts.omit, - Opts.require, + Opts.include, ] + GLOBAL_ARGS, usage = "[options] [modules]", description = "Create an HTML report of the coverage of the files. " @@ -276,7 +276,7 @@ CMDS = { [ Opts.ignore_errors, Opts.omit, - Opts.require, + Opts.include, Opts.show_missing, ] + GLOBAL_ARGS, usage = "[options] [modules]", @@ -291,7 +291,7 @@ CMDS = { Opts.parallel_mode, Opts.timid, Opts.omit, - Opts.require, + Opts.include, ] + GLOBAL_ARGS, defaults = {'erase_first': True}, cmd = "run", @@ -303,7 +303,7 @@ CMDS = { [ Opts.ignore_errors, Opts.omit, - Opts.require, + Opts.include, Opts.output_xml, ] + GLOBAL_ARGS, cmd = "xml", @@ -508,10 +508,10 @@ class CoverageScript(object): if options.omit: omit = options.omit.split(',') report_args['omit_prefixes'] = omit - require = None - if options.require: - require = options.require.split(',') - report_args['require_prefixes'] = require + include = None + if options.include: + include = options.include.split(',') + report_args['include_prefixes'] = include if 'report' in options.actions: self.coverage.report( diff --git a/coverage/codeunit.py b/coverage/codeunit.py index 51640b80..5df49804 100644 --- a/coverage/codeunit.py +++ b/coverage/codeunit.py @@ -6,16 +6,16 @@ from coverage.backward import string_class, StringIO from coverage.misc import CoverageException -def code_unit_factory(morfs, file_locator, omit_prefixes=None, require_prefixes=None): +def code_unit_factory(morfs, file_locator, omit_prefixes=None, include_prefixes=None): """Construct a list of CodeUnits from polymorphic inputs. `morfs` is a module or a filename, or a list of same. `file_locator` is a FileLocator that can help resolve filenames. `omit_prefixes` is a list of prefixes. CodeUnits that match those prefixes will be omitted from the list. - `require_prefixes` is a list of prefixes. Only CodeUnits that match those prefixes + `include_prefixes` is a list of prefixes. Only CodeUnits that match those prefixes will be included in the list. - You are required to pass at most one of `omit_prefixes` and `require_prefixes`. + You are required to pass at most one of `omit_prefixes` and `include_prefixes`. Returns a list of CodeUnit objects. @@ -36,9 +36,9 @@ def code_unit_factory(morfs, file_locator, omit_prefixes=None, require_prefixes= code_units = [CodeUnit(morf, file_locator) for morf in morfs] - if require_prefixes: - assert not isinstance(require_prefixes, string_class) # common mistake - prefixes = [file_locator.abs_file(p) for p in require_prefixes] + if include_prefixes: + assert not isinstance(include_prefixes, string_class) # common mistake + prefixes = [file_locator.abs_file(p) for p in include_prefixes] filtered = [] for cu in code_units: for prefix in prefixes: diff --git a/coverage/config.py b/coverage/config.py index 92d83016..b560fb2a 100644 --- a/coverage/config.py +++ b/coverage/config.py @@ -25,7 +25,7 @@ class CoverageConfig(object): self.exclude_list = ['(?i)# *pragma[: ]*no *cover'] self.ignore_errors = False self.omit_prefixes = None - self.require_prefixes = None + self.include_prefixes = None # Defaults for [html] self.html_dir = "htmlcov" @@ -78,16 +78,16 @@ class CoverageConfig(object): omit = omit.strip() if omit: self.omit_prefixes.append(omit) - if cp.has_option('run', 'require'): - # require is a list of prefixes, on separate lines, or separated by + if cp.has_option('run', 'include'): + # include is a list of prefixes, on separate lines, or separated by # commas. - require_list = cp.get('run', 'require') - self.require_prefixes = [] - for require_line in require_list.split('\n'): - for require in require_line.split(','): - require = require.strip() - if require: - self.require_prefixes.append(require) + include_list = cp.get('run', 'include') + self.include_prefixes = [] + for include_line in include_list.split('\n'): + for include in include_line.split(','): + include = include.strip() + if include: + self.include_prefixes.append(include) # [report] if cp.has_option('report', 'exclude_lines'): @@ -106,16 +106,16 @@ class CoverageConfig(object): omit = omit.strip() if omit: self.omit_prefixes.append(omit) - if cp.has_option('report', 'require'): - # require is a list of prefixes, on separate lines, or separated by + if cp.has_option('report', 'include'): + # include is a list of prefixes, on separate lines, or separated by # commas. - require_list = cp.get('report', 'require') - self.require_prefixes = [] - for require_line in require_list.split('\n'): - for require in require_line.split(','): - require = require.strip() - if require: - self.require_prefixes.append(require) + include_list = cp.get('report', 'include') + self.include_prefixes = [] + for include_line in include_list.split('\n'): + for include in include_line.split(','): + include = include.strip() + if include: + self.include_prefixes.append(include) # [html] if cp.has_option('html', 'directory'): diff --git a/coverage/control.py b/coverage/control.py index 2c774ae6..9ac7fea9 100644 --- a/coverage/control.py +++ b/coverage/control.py @@ -31,7 +31,7 @@ class coverage(object): """ def __init__(self, data_file=None, data_suffix=None, cover_pylib=None, - auto_data=False, timid=None, branch=None, config_file=True, omit_prefixes=None, require_prefixes=None): + auto_data=False, timid=None, branch=None, config_file=True, omit_prefixes=None, include_prefixes=None): """ `data_file` is the base name of the data file to use, defaulting to ".coverage". `data_suffix` is appended (with a dot) to `data_file` to @@ -61,10 +61,10 @@ class coverage(object): `omit_prefixes` is a list of prefixes. CodeUnits that match those prefixes will be omitted from the list. - `require_prefixes` is a list of prefixes. Only CodeUnits that match those prefixes + `include_prefixes` is a list of prefixes. Only CodeUnits that match those prefixes will be included in the list. - You are required to pass at most one of `omit_prefixes` and `require_prefixes`. + You are required to pass at most one of `omit_prefixes` and `include_prefixes`. """ from coverage import __version__ @@ -89,7 +89,7 @@ class coverage(object): data_file=data_file, cover_pylib=cover_pylib, timid=timid, branch=branch, parallel=bool_or_none(data_suffix), omit_prefixes=omit_prefixes, - require_prefixes=require_prefixes + include_prefixes=include_prefixes ) self.auto_data = auto_data @@ -104,10 +104,10 @@ class coverage(object): self.omit_prefixes = [self.file_locator.abs_file(p) for p in self.config.omit_prefixes] else: self.omit_prefixes = [] - if self.config.require_prefixes: - self.require_prefixes = [self.file_locator.abs_file(p) for p in self.config.require_prefixes] + if self.config.include_prefixes: + self.include_prefixes = [self.file_locator.abs_file(p) for p in self.config.include_prefixes] else: - self.require_prefixes = [] + self.include_prefixes = [] self.collector = Collector( self._should_trace, timid=self.config.timid, @@ -190,8 +190,8 @@ class coverage(object): if canonical.startswith(self.cover_prefix): return False - if self.require_prefixes: - for prefix in self.require_prefixes: + if self.include_prefixes: + for prefix in self.include_prefixes: if canonical.startswith(prefix): return canonical else: @@ -350,7 +350,7 @@ class coverage(object): return Analysis(self, it) def report(self, morfs=None, show_missing=True, ignore_errors=None, - file=None, omit_prefixes=None, require_prefixes=None): # pylint: disable-msg=W0622 + file=None, omit_prefixes=None, include_prefixes=None): # pylint: disable-msg=W0622 """Write a summary report to `file`. Each module in `morfs` is listed, with counts of statements, executed @@ -358,24 +358,24 @@ class coverage(object): `omit_prefixes` is a list of prefixes. CodeUnits that match those prefixes will be omitted from the list. - `require_prefixes` is a list of prefixes. Only CodeUnits that match those prefixes + `include_prefixes` is a list of prefixes. Only CodeUnits that match those prefixes will be included in the list. - You are required to pass at most one of `omit_prefixes` and `require_prefixes`. + You are required to pass at most one of `omit_prefixes` and `include_prefixes`. """ self.config.from_args( ignore_errors=ignore_errors, omit_prefixes=omit_prefixes, - require_prefixes=require_prefixes + include_prefixes=include_prefixes ) reporter = SummaryReporter( self, show_missing, self.config.ignore_errors ) reporter.report( - morfs, outfile=file, omit_prefixes=self.config.omit_prefixes, require_prefixes=self.config.require_prefixes + morfs, outfile=file, omit_prefixes=self.config.omit_prefixes, include_prefixes=self.config.include_prefixes ) def annotate(self, morfs=None, directory=None, ignore_errors=None, - omit_prefixes=None, require_prefixes=None): + omit_prefixes=None, include_prefixes=None): """Annotate a list of modules. Each module in `morfs` is annotated. The source is written to a new @@ -385,45 +385,45 @@ class coverage(object): `omit_prefixes` is a list of prefixes. CodeUnits that match those prefixes will be omitted from the list. - `require_prefixes` is a list of prefixes. Only CodeUnits that match those prefixes + `include_prefixes` is a list of prefixes. Only CodeUnits that match those prefixes will be included in the list. - You are required to pass at most one of `omit_prefixes` and `require_prefixes`. + You are required to pass at most one of `omit_prefixes` and `include_prefixes`. """ self.config.from_args( ignore_errors=ignore_errors, omit_prefixes=omit_prefixes, - require_prefixes=require_prefixes + include_prefixes=include_prefixes ) reporter = AnnotateReporter(self, self.config.ignore_errors) reporter.report( - morfs, directory=directory, omit_prefixes=self.config.omit_prefixes, require_prefixes=self.config.require_prefixes + morfs, directory=directory, omit_prefixes=self.config.omit_prefixes, include_prefixes=self.config.include_prefixes ) def html_report(self, morfs=None, directory=None, ignore_errors=None, - omit_prefixes=None, require_prefixes=None): + omit_prefixes=None, include_prefixes=None): """Generate an HTML report. `omit_prefixes` is a list of prefixes. CodeUnits that match those prefixes will be omitted from the list. - `require_prefixes` is a list of prefixes. Only CodeUnits that match those prefixes + `include_prefixes` is a list of prefixes. Only CodeUnits that match those prefixes will be included in the list. - You are required to pass at most one of `omit_prefixes` and `require_prefixes`. + You are required to pass at most one of `omit_prefixes` and `include_prefixes`. """ self.config.from_args( ignore_errors=ignore_errors, omit_prefixes=omit_prefixes, - require_prefixes=require_prefixes, + include_prefixes=include_prefixes, html_dir=directory, ) reporter = HtmlReporter(self, self.config.ignore_errors) reporter.report( morfs, directory=self.config.html_dir, omit_prefixes=self.config.omit_prefixes, - require_prefixes=self.config.require_prefixes + include_prefixes=self.config.include_prefixes ) def xml_report(self, morfs=None, outfile=None, ignore_errors=None, - omit_prefixes=None, require_prefixes=None): + omit_prefixes=None, include_prefixes=None): """Generate an XML report of coverage results. The report is compatible with Cobertura reports. @@ -433,14 +433,14 @@ class coverage(object): `omit_prefixes` is a list of prefixes. CodeUnits that match those prefixes will be omitted from the list. - `require_prefixes` is a list of prefixes. Only CodeUnits that match those prefixes + `include_prefixes` is a list of prefixes. Only CodeUnits that match those prefixes will be included in the list. - You are required to pass at most one of `omit_prefixes` and `require_prefixes`. + You are required to pass at most one of `omit_prefixes` and `include_prefixes`. """ self.config.from_args( ignore_errors=ignore_errors, omit_prefixes=omit_prefixes, - require_prefixes=require_prefixes, + include_prefixes=include_prefixes, xml_output=outfile, ) file_to_close = None @@ -453,7 +453,7 @@ class coverage(object): try: reporter = XmlReporter(self, self.config.ignore_errors) reporter.report( - morfs, omit_prefixes=self.config.omit_prefixes, require_prefixes=self.config.require_prefixes, outfile=outfile + morfs, omit_prefixes=self.config.omit_prefixes, include_prefixes=self.config.include_prefixes, outfile=outfile ) finally: if file_to_close: diff --git a/coverage/html.py b/coverage/html.py index 61712f36..16ec16bd 100644 --- a/coverage/html.py +++ b/coverage/html.py @@ -31,7 +31,7 @@ class HtmlReporter(Reporter): self.files = [] self.arcs = coverage.data.has_arcs() - def report(self, morfs, directory, omit_prefixes=None, require_prefixes=None): + def report(self, morfs, directory, omit_prefixes=None, include_prefixes=None): """Generate an HTML report for `morfs`. `morfs` is a list of modules or filenames. `directory` is where to put @@ -40,14 +40,14 @@ class HtmlReporter(Reporter): `omit_prefixes` is a list of prefixes. CodeUnits that match those prefixes will be omitted from the list. - `require_prefixes` is a list of prefixes. Only CodeUnits that match those prefixes + `include_prefixes` is a list of prefixes. Only CodeUnits that match those prefixes will be included in the list. - You are required to pass at most one of `omit_prefixes` and `require_prefixes`. + You are required to pass at most one of `omit_prefixes` and `include_prefixes`. """ assert directory, "must provide a directory for html reporting" # Process all the files. - self.report_files(self.html_file, morfs, directory, omit_prefixes, require_prefixes) + self.report_files(self.html_file, morfs, directory, omit_prefixes, include_prefixes) # Write the index file. self.index_file() diff --git a/coverage/report.py b/coverage/report.py index e2a09fbf..9e6b29d8 100644 --- a/coverage/report.py +++ b/coverage/report.py @@ -24,35 +24,35 @@ class Reporter(object): # classes. self.directory = None - def find_code_units(self, morfs, omit_prefixes, require_prefixes): + def find_code_units(self, morfs, omit_prefixes, include_prefixes): """Find the code units we'll report on. `morfs` is a list of modules or filenames. `omit_prefixes` is a list of prefixes to leave out of the list. `omit_prefixes` is a list of prefixes. CodeUnits that match those prefixes will be omitted from the list. - `require_prefixes` is a list of prefixes. Only CodeUnits that match those prefixes + `include_prefixes` is a list of prefixes. Only CodeUnits that match those prefixes will be included in the list. - You are required to pass at most one of `omit_prefixes` and `require_prefixes`. + You are required to pass at most one of `omit_prefixes` and `include_prefixes`. """ morfs = morfs or self.coverage.data.executed_files() self.code_units = code_unit_factory( - morfs, self.coverage.file_locator, omit_prefixes, require_prefixes) + morfs, self.coverage.file_locator, omit_prefixes, include_prefixes) self.code_units.sort() def report_files(self, report_fn, morfs, directory=None, - omit_prefixes=None, require_prefixes=None): + omit_prefixes=None, include_prefixes=None): """Run a reporting function on a number of morfs. `report_fn` is called for each relative morf in `morfs`. `omit_prefixes` is a list of prefixes. CodeUnits that match those prefixes will be omitted from the list. - `require_prefixes` is a list of prefixes. Only CodeUnits that match those prefixes + `include_prefixes` is a list of prefixes. Only CodeUnits that match those prefixes will be included in the list. - You are required to pass at most one of `omit_prefixes` and `require_prefixes`. + You are required to pass at most one of `omit_prefixes` and `include_prefixes`. """ - self.find_code_units(morfs, omit_prefixes, require_prefixes) + self.find_code_units(morfs, omit_prefixes, include_prefixes) if not self.code_units: raise CoverageException("No data to report.") diff --git a/coverage/summary.py b/coverage/summary.py index 696f6b36..df730375 100644 --- a/coverage/summary.py +++ b/coverage/summary.py @@ -14,16 +14,16 @@ class SummaryReporter(Reporter): self.show_missing = show_missing self.branches = coverage.data.has_arcs() - def report(self, morfs, omit_prefixes=None, outfile=None, require_prefixes=None): + def report(self, morfs, omit_prefixes=None, outfile=None, include_prefixes=None): """Writes a report summarizing coverage statistics per module. `omit_prefixes` is a list of prefixes. CodeUnits that match those prefixes will be omitted from the list. - `require_prefixes` is a list of prefixes. Only CodeUnits that match those prefixes + `include_prefixes` is a list of prefixes. Only CodeUnits that match those prefixes will be included in the list. - You are required to pass at most one of `omit_prefixes` and `require_prefixes`. + You are required to pass at most one of `omit_prefixes` and `include_prefixes`. """ - self.find_code_units(morfs, omit_prefixes, require_prefixes) + self.find_code_units(morfs, omit_prefixes, include_prefixes) # Prepare the formatting strings max_name = max([len(cu.name) for cu in self.code_units] + [5]) diff --git a/coverage/xmlreport.py b/coverage/xmlreport.py index 4f91b1b6..2fb57b26 100644 --- a/coverage/xmlreport.py +++ b/coverage/xmlreport.py @@ -22,7 +22,7 @@ class XmlReporter(Reporter): self.xml_out = None self.arcs = coverage.data.has_arcs() - def report(self, morfs, omit_prefixes=None, require_prefixes=None, outfile=None): + def report(self, morfs, omit_prefixes=None, include_prefixes=None, outfile=None): """Generate a Cobertura-compatible XML report for `morfs`. `morfs` is a list of modules or filenames. `omit_prefixes` is a list @@ -30,9 +30,9 @@ class XmlReporter(Reporter): `omit_prefixes` is a list of prefixes. CodeUnits that match those prefixes will be omitted from the list. - `require_prefixes` is a list of prefixes. Only CodeUnits that match those prefixes + `include_prefixes` is a list of prefixes. Only CodeUnits that match those prefixes will be included in the list. - You are required to pass at most one of `omit_prefixes` and `require_prefixes`. + You are required to pass at most one of `omit_prefixes` and `include_prefixes`. """ # Initial setup. outfile = outfile or sys.stdout @@ -57,7 +57,7 @@ class XmlReporter(Reporter): # Call xml_file for each file in the data. self.packages = {} - self.report_files(self.xml_file, morfs, omit_prefixes=omit_prefixes, require_prefixes=require_prefixes) + self.report_files(self.xml_file, morfs, omit_prefixes=omit_prefixes, include_prefixes=include_prefixes) lnum_tot, lhits_tot = 0, 0 bnum_tot, bhits_tot = 0, 0 diff --git a/test/test_cmdline.py b/test/test_cmdline.py index fcb3caaf..f446c0be 100644 --- a/test/test_cmdline.py +++ b/test/test_cmdline.py @@ -159,31 +159,31 @@ class ClassicCmdLineTest(CmdLineTest): def testReport(self): # coverage -r [-m] [-i] [-o DIR,...] [FILE1 FILE2 ...] self.cmd_executes("-r", self.INIT_LOAD + """\ - .report(ignore_errors=None, omit_prefixes=None, require_prefixes=None, morfs=[], + .report(ignore_errors=None, omit_prefixes=None, include_prefixes=None, morfs=[], show_missing=None) """) self.cmd_executes("-r -i", self.INIT_LOAD + """\ - .report(ignore_errors=True, omit_prefixes=None, require_prefixes=None, morfs=[], + .report(ignore_errors=True, omit_prefixes=None, include_prefixes=None, morfs=[], show_missing=None) """) self.cmd_executes("-r -m", self.INIT_LOAD + """\ - .report(ignore_errors=None, omit_prefixes=None, require_prefixes=None, morfs=[], + .report(ignore_errors=None, omit_prefixes=None, include_prefixes=None, morfs=[], show_missing=True) """) self.cmd_executes("-r -o fooey", self.INIT_LOAD + """\ - .report(ignore_errors=None, omit_prefixes=["fooey"], require_prefixes=None, + .report(ignore_errors=None, omit_prefixes=["fooey"], include_prefixes=None, morfs=[], show_missing=None) """) self.cmd_executes("-r -o fooey,booey", self.INIT_LOAD + """\ - .report(ignore_errors=None, omit_prefixes=["fooey", "booey"], require_prefixes=None, + .report(ignore_errors=None, omit_prefixes=["fooey", "booey"], include_prefixes=None, morfs=[], show_missing=None) """) self.cmd_executes("-r mod1", self.INIT_LOAD + """\ - .report(ignore_errors=None, omit_prefixes=None, require_prefixes=None, + .report(ignore_errors=None, omit_prefixes=None, include_prefixes=None, morfs=["mod1"], show_missing=None) """) self.cmd_executes("-r mod1 mod2 mod3", self.INIT_LOAD + """\ - .report(ignore_errors=None, omit_prefixes=None, require_prefixes=None, + .report(ignore_errors=None, omit_prefixes=None, include_prefixes=None, morfs=["mod1", "mod2", "mod3"], show_missing=None) """) @@ -201,31 +201,31 @@ class ClassicCmdLineTest(CmdLineTest): # coverage -a [-d DIR] [-i] [-o DIR,...] [FILE1 FILE2 ...] self.cmd_executes("-a", self.INIT_LOAD + """\ .annotate(directory=None, ignore_errors=None, - omit_prefixes=None, require_prefixes=None, morfs=[]) + omit_prefixes=None, include_prefixes=None, morfs=[]) """) self.cmd_executes("-a -d dir1", self.INIT_LOAD + """\ .annotate(directory="dir1", ignore_errors=None, - omit_prefixes=None, require_prefixes=None, morfs=[]) + omit_prefixes=None, include_prefixes=None, morfs=[]) """) self.cmd_executes("-a -i", self.INIT_LOAD + """\ .annotate(directory=None, ignore_errors=True, - omit_prefixes=None, require_prefixes=None, morfs=[]) + omit_prefixes=None, include_prefixes=None, morfs=[]) """) self.cmd_executes("-a -o fooey", self.INIT_LOAD + """\ .annotate(directory=None, ignore_errors=None, - omit_prefixes=["fooey"], require_prefixes=None, morfs=[]) + omit_prefixes=["fooey"], include_prefixes=None, morfs=[]) """) self.cmd_executes("-a -o fooey,booey", self.INIT_LOAD + """\ .annotate(directory=None, ignore_errors=None, - omit_prefixes=["fooey", "booey"], require_prefixes=None, morfs=[]) + omit_prefixes=["fooey", "booey"], include_prefixes=None, morfs=[]) """) self.cmd_executes("-a mod1", self.INIT_LOAD + """\ .annotate(directory=None, ignore_errors=None, - omit_prefixes=None, require_prefixes=None, morfs=["mod1"]) + omit_prefixes=None, include_prefixes=None, morfs=["mod1"]) """) self.cmd_executes("-a mod1 mod2 mod3", self.INIT_LOAD + """\ .annotate(directory=None, ignore_errors=None, - omit_prefixes=None, require_prefixes=None, morfs=["mod1", "mod2", "mod3"]) + omit_prefixes=None, include_prefixes=None, morfs=["mod1", "mod2", "mod3"]) """) self.cmd_executes_same("-a", "--annotate") @@ -242,31 +242,31 @@ class ClassicCmdLineTest(CmdLineTest): # coverage -b -d DIR [-i] [-o DIR,...] [FILE1 FILE2 ...] self.cmd_executes("-b", self.INIT_LOAD + """\ .html_report(directory=None, ignore_errors=None, - omit_prefixes=None, require_prefixes=None, morfs=[]) + omit_prefixes=None, include_prefixes=None, morfs=[]) """) self.cmd_executes("-b -d dir1", self.INIT_LOAD + """\ .html_report(directory="dir1", ignore_errors=None, - omit_prefixes=None, require_prefixes=None, morfs=[]) + omit_prefixes=None, include_prefixes=None, morfs=[]) """) self.cmd_executes("-b -i", self.INIT_LOAD + """\ .html_report(directory=None, ignore_errors=True, - omit_prefixes=None, require_prefixes=None, morfs=[]) + omit_prefixes=None, include_prefixes=None, morfs=[]) """) self.cmd_executes("-b -o fooey", self.INIT_LOAD + """\ .html_report(directory=None, ignore_errors=None, - omit_prefixes=["fooey"], require_prefixes=None, morfs=[]) + omit_prefixes=["fooey"], include_prefixes=None, morfs=[]) """) self.cmd_executes("-b -o fooey,booey", self.INIT_LOAD + """\ .html_report(directory=None, ignore_errors=None, - omit_prefixes=["fooey", "booey"], require_prefixes=None, morfs=[]) + omit_prefixes=["fooey", "booey"], include_prefixes=None, morfs=[]) """) self.cmd_executes("-b mod1", self.INIT_LOAD + """\ .html_report(directory=None, ignore_errors=None, - omit_prefixes=None, require_prefixes=None, morfs=["mod1"]) + omit_prefixes=None, include_prefixes=None, morfs=["mod1"]) """) self.cmd_executes("-b mod1 mod2 mod3", self.INIT_LOAD + """\ .html_report(directory=None, ignore_errors=None, - omit_prefixes=None, require_prefixes=None, morfs=["mod1", "mod2", "mod3"]) + omit_prefixes=None, include_prefixes=None, morfs=["mod1", "mod2", "mod3"]) """) self.cmd_executes_same("-b", "--html") @@ -471,35 +471,35 @@ class NewCmdLineTest(CmdLineTest): def testXml(self): # coverage xml [-i] [--omit DIR,...] [FILE1 FILE2 ...] self.cmd_executes("xml", self.INIT_LOAD + """\ - .xml_report(ignore_errors=None, omit_prefixes=None, require_prefixes=None, morfs=[], + .xml_report(ignore_errors=None, omit_prefixes=None, include_prefixes=None, morfs=[], outfile="coverage.xml") """) self.cmd_executes("xml -i", self.INIT_LOAD + """\ - .xml_report(ignore_errors=True, omit_prefixes=None, require_prefixes=None, morfs=[], + .xml_report(ignore_errors=True, omit_prefixes=None, include_prefixes=None, morfs=[], outfile="coverage.xml") """) self.cmd_executes("xml -o myxml.foo", self.INIT_LOAD + """\ - .xml_report(ignore_errors=None, omit_prefixes=None, require_prefixes=None, morfs=[], + .xml_report(ignore_errors=None, omit_prefixes=None, include_prefixes=None, morfs=[], outfile="myxml.foo") """) self.cmd_executes("xml -o -", self.INIT_LOAD + """\ - .xml_report(ignore_errors=None, omit_prefixes=None, require_prefixes=None, morfs=[], + .xml_report(ignore_errors=None, omit_prefixes=None, include_prefixes=None, morfs=[], outfile="-") """) self.cmd_executes("xml --omit fooey", self.INIT_LOAD + """\ - .xml_report(ignore_errors=None, omit_prefixes=["fooey"], require_prefixes=None, morfs=[], + .xml_report(ignore_errors=None, omit_prefixes=["fooey"], include_prefixes=None, morfs=[], outfile="coverage.xml") """) self.cmd_executes("xml --omit fooey,booey", self.INIT_LOAD + """\ - .xml_report(ignore_errors=None, omit_prefixes=["fooey", "booey"], require_prefixes=None, + .xml_report(ignore_errors=None, omit_prefixes=["fooey", "booey"], include_prefixes=None, morfs=[], outfile="coverage.xml") """) self.cmd_executes("xml mod1", self.INIT_LOAD + """\ - .xml_report(ignore_errors=None, omit_prefixes=None, require_prefixes=None, morfs=["mod1"], + .xml_report(ignore_errors=None, omit_prefixes=None, include_prefixes=None, morfs=["mod1"], outfile="coverage.xml") """) self.cmd_executes("xml mod1 mod2 mod3", self.INIT_LOAD + """\ - .xml_report(ignore_errors=None, omit_prefixes=None, require_prefixes=None, + .xml_report(ignore_errors=None, omit_prefixes=None, include_prefixes=None, morfs=["mod1", "mod2", "mod3"], outfile="coverage.xml") """) |