diff options
| -rw-r--r-- | coverage/cmdline.py | 4 | ||||
| -rw-r--r-- | coverage/control.py | 6 | ||||
| -rw-r--r-- | coverage/plugin.py | 2 | ||||
| -rw-r--r-- | tests/test_plugins.py | 18 |
4 files changed, 15 insertions, 15 deletions
diff --git a/coverage/cmdline.py b/coverage/cmdline.py index 3b624724..8c341e13 100644 --- a/coverage/cmdline.py +++ b/coverage/cmdline.py @@ -570,9 +570,9 @@ class CoverageScript(object): return ERR for info in args: if info == 'sys': - sysinfo = self.coverage.sysinfo() + sys_info = self.coverage.sys_info() print(info_header("sys")) - for line in info_formatter(sysinfo): + for line in info_formatter(sys_info): print(" %s" % line) elif info == 'data': self.coverage.load() diff --git a/coverage/control.py b/coverage/control.py index 5724a938..3f18c3ea 100644 --- a/coverage/control.py +++ b/coverage/control.py @@ -300,10 +300,10 @@ class Coverage(object): wrote_any = True if self.debug.should('sys'): - self.debug.write_formatted_info("sys", self.sysinfo()) + self.debug.write_formatted_info("sys", self.sys_info()) for plugin in self.plugins: header = "sys: " + plugin.plugin_name - info = plugin.sysinfo() + info = plugin.sys_info() self.debug.write_formatted_info(header, info) wrote_any = True @@ -957,7 +957,7 @@ class Coverage(object): if delete_file: file_be_gone(self.config.xml_output) - def sysinfo(self): + def sys_info(self): """Return a list of (key, value) pairs showing internal information.""" import coverage as covmod diff --git a/coverage/plugin.py b/coverage/plugin.py index c1246274..f62e2d49 100644 --- a/coverage/plugin.py +++ b/coverage/plugin.py @@ -57,7 +57,7 @@ class CoveragePlugin(object): """ _needs_to_implement(self, "file_reporter") - def sysinfo(self): + def sys_info(self): """Return a list of information useful for debugging. This method will be invoked for ``coverage run --debug=sys``. Your diff --git a/tests/test_plugins.py b/tests/test_plugins.py index 5485005b..2a8b089d 100644 --- a/tests/test_plugins.py +++ b/tests/test_plugins.py @@ -137,30 +137,30 @@ class PluginTest(CoverageTest): cov.start() cov.stop() - def test_plugin_sysinfo(self): - self.make_file("plugin_sysinfo.py", """\ + def test_plugin_sys_info(self): + self.make_file("plugin_sys_info.py", """\ import coverage class Plugin(coverage.CoveragePlugin): - def sysinfo(self): + def sys_info(self): return [("hello", "world")] """) debug_out = StringIO() cov = coverage.Coverage(debug=["sys"]) cov._debug_file = debug_out - cov.config["run:plugins"] = ["plugin_sysinfo"] + cov.config["run:plugins"] = ["plugin_sys_info"] cov.load() out_lines = debug_out.getvalue().splitlines() expected_end = [ - "-- sys: plugin_sysinfo ---------------------------------------", + "-- sys: plugin_sys_info --------------------------------------", " hello: world", "-- end -------------------------------------------------------", ] self.assertEqual(expected_end, out_lines[-len(expected_end):]) - def test_plugin_with_no_sysinfo(self): - self.make_file("plugin_no_sysinfo.py", """\ + def test_plugin_with_no_sys_info(self): + self.make_file("plugin_no_sys_info.py", """\ import coverage class Plugin(coverage.CoveragePlugin): @@ -169,12 +169,12 @@ class PluginTest(CoverageTest): debug_out = StringIO() cov = coverage.Coverage(debug=["sys"]) cov._debug_file = debug_out - cov.config["run:plugins"] = ["plugin_no_sysinfo"] + cov.config["run:plugins"] = ["plugin_no_sys_info"] cov.load() out_lines = debug_out.getvalue().splitlines() expected_end = [ - "-- sys: plugin_no_sysinfo ------------------------------------", + "-- sys: plugin_no_sys_info -----------------------------------", "-- end -------------------------------------------------------", ] self.assertEqual(expected_end, out_lines[-len(expected_end):]) |