Merge lp:~jelmer/brz/coverage-coverage into lp:brz

[Jelmer Vernooij]

Switch --coverage to use coverage module.

This should make it easier to integrate with e.g. codecov.io; it also allows more easily generating HTML coverage output (rather than the text output that tracer generates).

[Jelmer Vernooij (jelmer)]

review: Approve

[Martin Packman (gz)]

Looks good to me. The envvar setting is a little ugly but interface is otherwise close enough and this is the module I use on other projects.

review: Approve

[The Breezy Bot (the-breezy-bot)]

Running landing tests failed
https://ci.breezy-vcs.org/job/brz-dev/144/

[The Breezy Bot (the-breezy-bot)]

Running landing tests failed
https://ci.breezy-vcs.org/job/brz-dev/145/

[The Breezy Bot (the-breezy-bot)]

Running landing tests failed
https://ci.breezy-vcs.org/job/brz-dev/146/

=== modified file '.bzrignore'
--- .bzrignore	2018-02-18 17:56:45 +0000
+++ .bzrignore	2018-05-09 23:48:22 +0000
@@ -74,3 +74,4 @@
 python3.passing.old
 python3.passing.new
 selftest.log
+.coverage
 
=== modified file '.coveragerc'
--- .coveragerc	2018-05-07 13:30:31 +0000
+++ .coveragerc	2018-05-09 23:48:22 +0000
@@ -1,5 +1,6 @@
 [run]
 branch = True
+source = breezy
 
 [report]
 exclude_lines =
 
=== modified file '.travis.yml'
--- .travis.yml	2018-05-07 13:35:54 +0000
+++ .travis.yml	2018-05-09 23:48:22 +0000
@@ -14,12 +14,12 @@
 matrix:
   include:
     - python: 2.7
-      env: SELFTEST_OPTIONS=""
+      env: SELFTEST_OPTIONS="--coverage"
            EXTRA_MAKE_ARGS="extensions"
 
 script:
   - make docs $EXTRA_MAKE_ARGS
-  - BRZ_PLUGIN_PATH=-site:-user python -Werror -Wignore::ImportWarning -Wignore::PendingDeprecationWarning -Wignore::DeprecationWarning -m coverage run -p --source=breezy ./brz selftest --parallel=fork $SELFTEST_OPTIONS
+  - BRZ_PLUGIN_PATH=-site:-user python -Werror -Wignore::ImportWarning -Wignore::PendingDeprecationWarning -Wignore::DeprecationWarning ./brz selftest --parallel=fork $SELFTEST_OPTIONS
 
 install:
   - sudo apt install python-all-dev python3-all-dev subunit
@@ -27,5 +27,4 @@
   - travis_retry pip install -U pip coverage codecov flake8 testtools paramiko fastimport configobj cython testscenarios six docutils python-subunit $TEST_REQUIRE
 
 after_success:
-  - python -m coverage combine
   - codecov
 
=== modified file 'breezy/commands.py'
--- breezy/commands.py	2017-11-12 13:53:51 +0000
+++ breezy/commands.py	2018-05-09 23:48:22 +0000
@@ -957,19 +957,16 @@
     return argdict
 
 
-def apply_coveraged(dirname, the_callable, *args, **kwargs):
-    import trace
-    tracer = trace.Trace(count=1, trace=0)
-    sys.settrace(tracer.globaltrace)
-    threading.settrace(tracer.globaltrace)
-
+def apply_coveraged(the_callable, *args, **kwargs):
+    import coverage
+    cov = coverage.Coverage()
+    os.environ['COVERAGE_PROCESS_START'] = cov.config_file
+    cov.start()
     try:
         return exception_to_return_code(the_callable, *args, **kwargs)
     finally:
-        sys.settrace(None)
-        results = tracer.results()
-        results.write_results(show_missing=1, summary=False,
-                              coverdir=dirname)
+        cov.stop()
+        cov.save()
 
 
 def apply_profiled(the_callable, *args, **kwargs):
@@ -1085,7 +1082,7 @@
         Run under the Python lsprof profiler.
 
     --coverage
-        Generate line coverage report in the specified directory.
+        Generate code coverage report
 
     --concurrency
         Specify the number of processes that can be run concurrently (selftest).
@@ -1095,8 +1092,8 @@
     trace.mutter("brz arguments: %r", argv)
 
     opt_lsprof = opt_profile = opt_no_plugins = opt_builtin = \
-            opt_no_l10n = opt_no_aliases = False
-    opt_lsprof_file = opt_coverage_dir = None
+            opt_coverage = opt_no_l10n = opt_no_aliases = False
+    opt_lsprof_file = None
 
     # --no-plugins is handled specially at a very early stage. We need
     # to load plugins before doing other command parsing so that they
@@ -1127,8 +1124,7 @@
             os.environ['BRZ_CONCURRENCY'] = argv[i + 1]
             i += 1
         elif a == '--coverage':
-            opt_coverage_dir = argv[i + 1]
-            i += 1
+            opt_coverage = True
         elif a == '--profile-imports':
             pass # already handled in startup script Bug #588277
         elif a.startswith('-D'):
@@ -1178,17 +1174,17 @@
         saved_verbosity_level = option._verbosity_level
         option._verbosity_level = 0
         if opt_lsprof:
-            if opt_coverage_dir:
+            if opt_coverage:
                 trace.warning(
                     '--coverage ignored, because --lsprof is in use.')
             ret = apply_lsprofiled(opt_lsprof_file, run, *run_argv)
         elif opt_profile:
-            if opt_coverage_dir:
+            if opt_coverage:
                 trace.warning(
                     '--coverage ignored, because --profile is in use.')
             ret = apply_profiled(run, *run_argv)
-        elif opt_coverage_dir:
-            ret = apply_coveraged(opt_coverage_dir, run, *run_argv)
+        elif opt_coverage:
+            ret = apply_coveraged(run, *run_argv)
         else:
             ret = run(*run_argv)
         return ret or 0
 
=== modified file 'breezy/plugin.py'
--- breezy/plugin.py	2017-10-26 11:10:38 +0000
+++ breezy/plugin.py	2018-05-09 23:48:22 +0000
@@ -463,7 +463,7 @@
     if state is None:
         state = breezy.get_global_state()
     items = []
-    for name, a_plugin in sorted(state.plugins.items()):
+    for name, a_plugin in sorted(getattr(state, 'plugins', {}).items()):
         items.append("%s[%s]" %
             (name, a_plugin.__version__))
     return ', '.join(items)
 
=== modified file 'breezy/tests/__init__.py'
--- breezy/tests/__init__.py	2018-03-30 14:54:24 +0000
+++ breezy/tests/__init__.py	2018-05-09 23:48:22 +0000
@@ -3487,6 +3487,12 @@
             try:
                 stream = os.fdopen(c2pwrite, 'wb', 1)
                 workaround_zealous_crypto_random()
+                try:
+                    import coverage
+                except ImportError:
+                    pass
+                else:
+                    coverage.process_startup()
                 os.close(c2pread)
                 # Leave stderr and stdout open so we can see test noise
                 # Close stdin so that the child goes away if it decides to