From 047469b14d7b710d40adff4cb820d70b502a148d Mon Sep 17 00:00:00 2001
From: Jiri Kucera <jkucera@redhat.com>
Date: Mon, 2 Sep 2019 14:27:10 +0200
Subject: [PATCH] Incorporate changes from PR #120

---
 .travis/fix-coverage.sh | 12 ++++++++++++
 tox.ini                 | 10 ++++++----
 2 files changed, 18 insertions(+), 4 deletions(-)
 create mode 100755 .travis/fix-coverage.sh

diff --git a/.travis/fix-coverage.sh b/.travis/fix-coverage.sh
new file mode 100755
index 0000000..1b66504
--- /dev/null
+++ b/.travis/fix-coverage.sh
@@ -0,0 +1,12 @@
+#!/bin/bash
+
+set -ex
+
+cat > .coveragerc <<EOF
+[paths]
+source =
+    .
+    $PWD
+EOF
+mv .coverage .coverage.merge
+coverage combine --append .
diff --git a/tox.ini b/tox.ini
index 3c7cfe4..c944221 100644
--- a/tox.ini
+++ b/tox.ini
@@ -115,6 +115,7 @@ commands =
 [testenv:pylint]
 envdir = {toxworkdir}/env-{env:TRAVIS_PYTHON_VERSION:2.7}
 basepython = python2.7
+passenv = RUN_PYLINT_*
 setenv =
     {[base]setenv}
 deps =
@@ -134,13 +135,14 @@ commands =
     flake8 --statistics {posargs} .
 
 [testenv:coveralls]
-envdir = {toxworkdir}/env-{env:TRAVIS_PYTHON_VERSION:2.7}
-basepython = python2.7
+envdir = {toxworkdir}/env-{env:TRAVIS_PYTHON_VERSION:coveralls}
 passenv = TRAVIS TRAVIS_*
+whitelist_externals = bash
 deps =
     coveralls
 changedir = {[base]changedir}
 commands =
+    bash -c 'cd ..; bash .travis/fix-coverage.sh; cd -'
     coveralls
 
 # LSR_MOLECULE_DEPS may contain aditional Molecule dependencies. For example,
@@ -235,8 +237,8 @@ max-line-length = 88
 [travis]
 python =
   2.6: py26,extra
-  2.7: py27,coveralls,flake8,pylint,extra
-  3.5: molecule_lint,molecule_syntax,molecule_test,extra
+  2.7: py27,flake8,pylint,extra
+  3.5: coveralls,molecule_lint,molecule_syntax,molecule_test,extra
   3.6: py36,black,extra
   3.7: py37,extra
   3.8: py38,extra