From 09f3046e6c7d027ae6f0d0ef6ec6cabb6d3130e9 Mon Sep 17 00:00:00 2001
From: Joachim Jablon <joachim.jablon@people-doc.com>
Date: Fri, 13 Dec 2019 23:39:25 +0100
Subject: [PATCH] Fix CI

---
 .travis.yml | 29 +++++++++++++++++------------
 tox.ini     |  4 ++--
 2 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index df0726e..579e365 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -15,6 +15,7 @@ matrix:
     env:
       TOX_ENV: py36-unit-tests
       COVERAGE_FLAG: unit
+
   - python: 3.6
     env:
       TOX_ENV: py36-integration-tests
@@ -24,31 +25,32 @@ matrix:
       PGHOST: 127.0.0.1
       COVERAGE_FLAG: integration
 
-  - python: 3.7
+  - python: 3.6
     env:
-      TOX_ENV: py37-unit-tests
-      COVERAGE_FLAG: unit
+      TOX_ENV: py36-acceptance-tests
+      PGUSER: postgres
+      PGPORT: 5432
+      PGPASSWORD: ""
+      PGHOST: 127.0.0.1
+      COVERAGE_FLAG: ""
+
   - python: 3.7
     env:
-      TOX_ENV: py37-integration-tests
+      TOX_ENV: py37-unit-tests,py37-integration-tests,py37-acceptance-tests
       PGUSER: postgres
       PGPORT: 5432
       PGPASSWORD: ""
       PGHOST: 127.0.0.1
-      COVERAGE_FLAG: integration
+      COVERAGE_FLAG: ""
 
   - python: 3.8
     env:
-      TOX_ENV: py38-unit-tests
-      COVERAGE_FLAG: unit
-  - python: 3.8
-    env:
-      TOX_ENV: py38-integration-tests
+      TOX_ENV: py38-unit-tests,py38-integration-tests,py38-acceptance-tests
       PGUSER: postgres
       PGPORT: 5432
       PGPASSWORD: ""
       PGHOST: 127.0.0.1
-      COVERAGE_FLAG: integration
+      COVERAGE_FLAG: ""
 
 install:
   - pip install tox codecov
@@ -57,4 +59,7 @@ script:
   - tox -e $TOX_ENV
 
 after_success:
-  - bash <(curl -s https://codecov.io/bash) -c -F $COVERAGE_FLAG
+  - |
+    if [ -n "$COVERAGE_FLAG" ];
+      then bash <(curl -s https://codecov.io/bash) -c -F $COVERAGE_FLAG;
+    fi
diff --git a/tox.ini b/tox.ini
index f732926..acced2b 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,6 @@
 [tox]
 envlist =
-    py{36}-{integration,unit}-tests,check-lint
+    py{36,37,38}-{integration,unit,acceptance}-tests,check-lint
 
 [testenv]
 whitelist_externals = make
@@ -12,6 +12,7 @@ commands =
     pip freeze -l
     unit-tests: pytest tests/unit
     integration-tests: pytest tests/integration
+    acceptance-tests: pytest tests/acceptance
 
 [testenv:check-lint]
 extras =
@@ -58,4 +59,3 @@ commands =
     # If this line breaks, fix with:
     # sort -bdfi docs/spelling_wordlist.txt -o docs/spelling_wordlist.txt
     sort -cbdfi docs/spelling_wordlist.txt
-