From 2a145e20398463d48e3756fb0e6edb2ce31e3f60 Mon Sep 17 00:00:00 2001
From: Roald de Vries <rdevries@thoughtworks.com>
Date: Wed, 23 Nov 2016 15:44:32 +0100
Subject: more verbose test output

---
 service/go | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

(limited to 'service/go')

diff --git a/service/go b/service/go
index 0a2297f8..7df9111b 100755
--- a/service/go
+++ b/service/go
@@ -3,6 +3,7 @@
 NUM_OF_CORES=''
 NUM_OF_JOBS=''
 TRIAL_PATH=''
+TRIAL_REPORTER='verbose'
 
 function getTrialAbsolutePath {
     TRIAL_PATH="$(which trial)"
@@ -58,14 +59,14 @@ function setupjs {
 function runIntegrationTests {
         echo "Executing Integration Tests."
         resolveNumOfJobs
-        trial -j $NUM_OF_JOBS --reporter=text $* test.integration
+        trial -j $NUM_OF_JOBS --reporter=$TRIAL_REPORTER $* test.integration
         echo "Done."
 }
 
 function runUnitTests {
         echo "Executing Unit Tests."
         removeZmqCertificates
-        trial --reporter=text $* test.unit
+        trial --reporter=$TRIAL_REPORTER $* test.unit
         echo "Done."
 }
 
@@ -87,7 +88,7 @@ function runCoverageUnit {
         echo "Generating Unit Test Converage Information."
         coverage erase
         getTrialAbsolutePath
-        coverage run -p --source=pixelated $TRIAL_PATH --reporter=text $* test.unit
+        coverage run -p --source=pixelated $TRIAL_PATH --reporter=$TRIAL_REPORTER $* test.unit
         coverage combine
         coverage html
         echo "Done."
@@ -97,9 +98,9 @@ function runCoverageIntegration {
         echo "Generating Integration Test Converage Information."
         coverage erase
         getTrialAbsolutePath
-        coverage run -p --source=pixelated $TRIAL_PATH --reporter=text $* test.integration
+        coverage run -p --source=pixelated $TRIAL_PATH --reporter=$TRIAL_REPORTER $* test.integration
         coverage combine
-        coverage html --ignore-errors
+        coverage html
         echo "Done."
 }
 
@@ -107,8 +108,8 @@ function runCoverageUnitAndIntegration {
         echo "Generating Unit and Integration Test Converage Information."
         coverage erase
         getTrialAbsolutePath
-        coverage run -p --source=pixelated $TRIAL_PATH --reporter=text test.unit
-        coverage run -p --source=pixelated $TRIAL_PATH --reporter=text test.integration
+        coverage run -p --source=pixelated $TRIAL_PATH --reporter=$TRIAL_REPORTER test.unit
+        coverage run -p --source=pixelated $TRIAL_PATH --reporter=$TRIAL_REPORTER test.integration
         coverage combine
         coverage html
         echo "Done."
-- 
cgit v1.2.3


From c3bc177d1cb71527d2b02af61d9b3d630cd3323c Mon Sep 17 00:00:00 2001
From: Roald de Vries <rdevries@thoughtworks.com>
Date: Tue, 6 Dec 2016 11:00:33 +0100
Subject: wipe python packages that already exist on reinstallation

---
 service/go | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'service/go')

diff --git a/service/go b/service/go
index 8ceae7db..904cb17b 100755
--- a/service/go
+++ b/service/go
@@ -38,11 +38,11 @@ function setuppy {
         echo "Installing Pixelated User Agent."
         pip install --upgrade pip setuptools
         if [ `uname -s` = "Darwin" ]; then
-                CFLAGS="-DCRYPTOPP_DISABLE_ASM=1" pip install -r requirements.txt
+                CFLAGS="-DCRYPTOPP_DISABLE_ASM=1" pip install --exists-action w -r requirements.txt
         else
-                pip install -r requirements.txt
+                pip install --exists-action w -r requirements.txt
         fi
-        pip install -r test_requirements.txt
+        pip install --exists-action w -r test_requirements.txt
         echo "Done."
 }
 
-- 
cgit v1.2.3