3 files changed, 19 insertions, 4 deletions

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ad5a5ba..fa2c0da 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,8 +1,12 @@
 image: maxking/mailman-ci-runner
 
-test:
+python35:
   script:
-  - tox -e 'py{35,36}-head'
+  - tox -e 'py35-head-cov'
+
+python36:
+  script:
+  - tox -e 'py36-head-cov'
 
 qa:
   script:
diff --git a/coverage.ini b/coverage.ini
new file mode 100644
index 0000000..6d9b367
--- /dev/null
+++ b/coverage.ini
@@ -0,0 +1,3 @@
+[run]
+source = mailman_pgp
+omit = setup.py
\ No newline at end of file
diff --git a/tox.ini b/tox.ini
index 69ec284..45633d4 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = qa, py35, py36, setup35, setup36
+envlist = qa, {py35, py36}{,-dev,-head}{-nocov,-cov} setup35, setup36
 skip_missing_interpreters = True
 
 [testenv]
@@ -8,13 +8,17 @@ deps =
      flufl.testing
      parameterized
      nose2
+     cov: coverage
      head: git+https://gitlab.com/mailman/mailman.git
      head: git+https://github.com/SecurityInnovation/PGPy
      # Expects a mailman repo and PGPy repo in parent directory.
      dev: -e../mailman
      dev: -e../PGPy
 commands =
-    python -m nose2 -v {posargs}
+    nocov: python -m nose2 -v {posargs}
+    cov: python -m coverage run {[coverage]rc} -m nose2 -v {posargs}
+    cov: python -m coverage html {[coverage]rc}
+    cov: python -m coverage report -m {[coverage]rc}
 
 [testenv:qa]
 basepython = python3
@@ -37,6 +41,10 @@ recreate = True
 basepython = python3.6
 commands = pip install -e .
 
+[coverage]
+rcfile = {toxinidir}/coverage.ini
+rc = --rcfile={[coverage]rcfile}
+
 [flake8]
 jobs = 1
 max-line-length = 79