Merge lp:~allenap/maas/parallel-coverage into lp:~maas-committers/maas/trunk

[Gavin Panella]

Collect coverage data when running tests in parallel.

The overhead of always doing this is so low that I didn't even thing it was worth making it optional.

[Lee Trager (ltrager)]

LGTM!

review: Approve

=== modified file '.bzrignore'
--- .bzrignore	2017-02-17 14:23:04 +0000
+++ .bzrignore	2017-03-23 12:45:28 +0000
@@ -3,6 +3,8 @@
 *.egg-info
 *.log
 ./.bzr
+./.coverage
+./.coverage.*
 ./.db.lock
 ./.failed
 ./.git
@@ -18,7 +20,6 @@
 ./bin
 ./build
 ./coverage
-./coverage.data
 ./coverage.xml
 ./db
 ./develop-eggs

=== modified file '.coveragerc'
--- .coveragerc	2015-02-27 18:33:32 +0000
+++ .coveragerc	2017-03-23 12:45:28 +0000
@@ -1,10 +1,21 @@
 [run]
-data_file = coverage.data
+branch = True
+source = src
+omit =
+  */testing.py
+  */testing/*
+  */tests/*
 
 [report]
+omit =
+  src/*/migrations/*
+  src/maastesting/*
 exclude_lines =
     # Have to re-enable the standard pragma
     pragma: no cover
-
     # Don't complain if tests don't hit defensive assertion code:
     raise NotImplementedError
+
+[html]
+directory = coverage
+title = Coverage for MAAS

=== modified file '.gitignore'
--- .gitignore	2017-02-17 14:23:04 +0000
+++ .gitignore	2017-03-23 12:45:28 +0000
@@ -3,6 +3,8 @@
 *.egg-info
 *.log
 /.bzr
+/.coverage
+/.coverage.*
 /.db.lock
 /.failed
 /.git
@@ -18,7 +20,6 @@
 /bin
 /build
 /coverage
-/coverage.data
 /coverage.xml
 /db
 /develop-eggs

=== modified file 'Makefile'
--- Makefile	2017-03-17 12:05:27 +0000
+++ Makefile	2017-03-23 12:45:28 +0000
@@ -223,18 +223,20 @@
 test+lxd: lxd $(strip $(test-scripts))
 	utilities/isolated-make-test
 
-test: bin/test.parallel
+test: bin/test.parallel bin/coverage
+	@$(RM) .coverage .coverage.*
 	@bin/test.parallel --subprocess-per-core
+	@bin/coverage combine
 
 test-serial: $(strip $(test-scripts))
 	@bin/maas-region makemigrations --dry-run --exit && exit 1 ||:
-	@$(RM) coverage.data .failed
+	@$(RM) .coverage .coverage.* .failed
 	$(foreach test,$^,$(test-template);)
 	@test ! -f .failed
 
 test-failed: $(strip $(test-scripts))
 	@bin/maas-region makemigrations --dry-run --exit && exit 1 ||:
-	@$(RM) coverage.data .failed
+	@$(RM) .coverage .coverage.* .failed
 	$(foreach test,$^,$(test-template-failed);)
 	@test ! -f .failed
 
@@ -268,19 +270,18 @@
 coverage-report: coverage/index.html
 	sensible-browser $< > /dev/null 2>&1 &
 
-coverage.xml: bin/coverage coverage.data
-	bin/coverage xml --include 'src/*' -o $@
+coverage.xml: bin/coverage .coverage
+	bin/coverage xml -o $@
 
 coverage/index.html: revno = $(or $(shell bzr revno 2>/dev/null),???)
-coverage/index.html: bin/coverage coverage.data
+coverage/index.html: bin/coverage .coverage
 	@$(RM) -r $(@D)
-	bin/coverage html --include 'src/*' \
-	    --omit 'src/*/tests/*,src/*/testing/*' \
-	    --title "MAAS r$(revno)" --directory $(@D)
+	bin/coverage html \
+	    --title "Coverage for MAAS r$(revno)" \
+	    --directory $(@D)
 
-coverage.data:
-	@$(error Use `$(MAKE) test-serial+coverage` to generate coverage \
-            data, or invoke a test script using the `--with-coverage` flag)
+.coverage:
+	@$(error Use `$(MAKE) test` to generate coverage)
 
 lint: \
     lint-py lint-py-complexity lint-py-imports \
@@ -409,7 +410,7 @@
 	$(RM) docs/api.rst
 	$(RM) -r docs/_autosummary docs/_build
 	$(RM) -r man/.doctrees
-	$(RM) coverage.data coverage.xml
+	$(RM) .coverage .coverage.* coverage.xml
 	$(RM) -r coverage
 	$(RM) -r .hypothesis
 	$(RM) -r bin include lib local

=== modified file 'src/maastesting/parallel.py'
--- src/maastesting/parallel.py	2017-02-17 14:23:04 +0000
+++ src/maastesting/parallel.py	2017-03-23 12:45:28 +0000
@@ -52,8 +52,11 @@
         """
 
     def extendCommand(self, command):
-        """Extend the command (a tuple) with additional arguments."""
-        return command
+        """Extend the command (a tuple) with additional arguments.
+
+        By default this ensures that coverage data is collected.
+        """
+        return ("bin/coverage", "run", "--parallel-mode", *command)
 
     def run(self, result):
         with tempfile.NamedTemporaryFile() as log:
@@ -72,10 +75,11 @@
                     })
 
     def _run(self, result, log):
-        # Build the script first, which may do nothing (but is quick).
+        # Build things first, which may do nothing (but is quick).
         with self.lock:
             subprocess.check_call(
-                ("make", "--quiet", self.script), stdout=log, stderr=log)
+                ("make", "--quiet", "bin/coverage", self.script),
+                stdout=log, stderr=log)
         # Run the script in a subprocess, capturing subunit output.
         pread, pwrite = os.pipe()
         with io.open(pread, "rb") as preader: