From 88ea9926ab4b13b69a0391c0f3030c8c67bd281b Mon Sep 17 00:00:00 2001
From: Mike McLean <mikem@redhat.com>
Date: Jun 01 2017 07:39:25 +0000
Subject: use coverage directly. adjust coverage config for py3 tests


---

diff --git a/.coveragerc b/.coveragerc
index 087bddf..f375367 100644
--- a/.coveragerc
+++ b/.coveragerc
@@ -1,5 +1,5 @@
 [run]
 
 omit =
-    /usr/lib/*
+    /usr/*
     tests/*
diff --git a/.coveragerc3 b/.coveragerc3
new file mode 100644
index 0000000..236173b
--- /dev/null
+++ b/.coveragerc3
@@ -0,0 +1,12 @@
+[run]
+
+; extra omissions for py3 for now
+
+omit =
+    /usr/*
+    tests/*
+    hub/*
+    util/*
+    koji/ssl/*
+    koji/daemon.py
+    koji/tasks.py
diff --git a/Makefile b/Makefile
index 221d0e5..2a6ff55 100644
--- a/Makefile
+++ b/Makefile
@@ -66,16 +66,21 @@ git-clean:
 
 test:
 	coverage erase
-	PYTHONPATH=hub/.:plugins/hub/.:plugins/builder/. nosetests --with-coverage --cover-package .
+	PYTHONPATH=hub/.:plugins/hub/.:plugins/builder/. coverage run \
+	    --source . /usr/bin/nosetests
+	coverage report
 	coverage html
-	@echo Coverage report in htmlcov/index.html
+	@echo Full coverage report in htmlcov/index.html
 
 test3:
 	coverage erase
-	PYTHONPATH=hub/.:plugins/hub/.:plugins/builder/. nosetests-3 \
-	    --with-coverage --cover-package . tests/test_lib tests/test_cli
+	PYTHONPATH=hub/.:plugins/hub/.:plugins/builder/. coverage3 run \
+	    --rcfile .coveragerc3 --source . \
+	    /usr/bin/nosetests-3 \
+	    tests/test_lib tests/test_cli
+	coverage report
 	coverage html
-	@echo Coverage report in htmlcov/index.html
+	@echo Full coverage report in htmlcov/index.html
 
 subdirs:
 	for d in $(SUBDIRS); do make -C $$d; [ $$? = 0 ] || exit 1; done