From 00dd98f58031c5bb3ea81fa19452807f7ce7b154 Mon Sep 17 00:00:00 2001
From: Michael Prokop <mprokop@sipwise.com>
Date: Tue, 8 Dec 2015 00:29:57 +0100
Subject: [PATCH] rename make target 'unittest' to 'test', install fakeroot,
 store reports in tool specific filenames

Change-Id: Iec752bf1b50749172ebd34ab8f06a2d0b8b96e19
---
 Makefile     | 10 +++++-----
 t/Dockerfile |  2 +-
 t/testrunner |  2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Makefile b/Makefile
index dab9f241..51988b31 100644
--- a/Makefile
+++ b/Makefile
@@ -60,12 +60,12 @@ perlcheck:
 	done; \
 	echo "-> perl check done."; \
 
-unittest:
+test:
 	mkdir -p $(RESULTS)
-	nosetests --xunit-file=$(RESULTS)/ngcpcfg.xml --with-xunit t/tests.py
-	# note: can't control output filename :(
+	nosetests --xunit-file=$(RESULTS)/nose1.xml --with-xunit t/tests.py
 	nose2-3 --plugin nose2.plugins.junitxml --junit-xml -s t/
-	py.test-3 --junit-xml=$(RESULTS)/ngcpcfg.xml t/tests.py
-
+	# can't control output filename :(
+	mv nose2-junit.xml $(RESULTS)/nose2.xml
+	py.test-3 --junit-xml=$(RESULTS)/pytest.xml t/tests.py
 
 # EOF
diff --git a/t/Dockerfile b/t/Dockerfile
index f84d085f..77f0a73b 100644
--- a/t/Dockerfile
+++ b/t/Dockerfile
@@ -19,7 +19,7 @@ deb https://deb.sipwise.com/autobuild/ release-trunk-jessie main\n" > /etc/apt/s
 RUN wget -O /etc/apt/trusted.gpg.d/sipwise.gpg https://deb.sipwise.com/spce/sipwise.gpg
 
 RUN apt-get update
-RUN apt-get install --assume-yes python-nose git make python3-nose2 python3-junitxml python3-pytest
+RUN apt-get install --assume-yes python-nose git make fakeroot python3-nose2 python3-junitxml python3-pytest
 
 RUN echo './t/testrunner' >>/root/.bash_history
 
diff --git a/t/testrunner b/t/testrunner
index 3492d2ec..1db2886e 100755
--- a/t/testrunner
+++ b/t/testrunner
@@ -16,4 +16,4 @@ else
   mkdir -p "${RESULTS}"
 fi
 
-RESULTS=${RESULTS} make unittest
+RESULTS=${RESULTS} make test