From 621388e5ae3e221a38372bbcf0e799b914f6dd27 Mon Sep 17 00:00:00 2001
From: Massimiliano Culpo <massimiliano.culpo@gmail.com>
Date: Sat, 20 Jan 2018 16:10:25 +0100
Subject: Restore multiprocessing in unit tests (#6949)

* Revert "Travis: use --concurrency=multiprocessing only on build tests (#6872)"

This reverts commit 596d463714d46929f81db62b171c5a772679bb12.

* Removing 'coverage combine' in test script

According to what was discovered in #6887, one of the problems is
calling 'coverage combine' twice without the '-a' flag. This removes
the first call within our test scripts.
---
 .coveragerc | 1 +
 1 file changed, 1 insertion(+)

(limited to '.coveragerc')

diff --git a/.coveragerc b/.coveragerc
index 224c472fa2..0201a4b502 100644
--- a/.coveragerc
+++ b/.coveragerc
@@ -2,6 +2,7 @@
 # .coveragerc to control coverage.py
 [run]
 parallel = True
+concurrency = multiprocessing
 branch = True
 source = lib
 omit =
-- 
cgit v1.2.3-70-g09d2