From 3b4cf12e687a955b8004d184a4079e8709b68ca8 Mon Sep 17 00:00:00 2001
From: Christophe CHAUVET <christophe.chauvet@gmail.com>
Date: Thu, 12 Apr 2018 19:26:35 +0200
Subject: [PATCH] Fix tox serve command (#1463)

* Fix tox serve command
* Fix tests fail on travis
---
 .gitignore            | 1 +
 .travis.yml           | 2 ++
 test-requirements.txt | 2 --
 tox.ini               | 3 +++
 4 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index 7b725b7a5..429e9f678 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,6 +11,7 @@ DEV
 .ropeproject
 modoboa.iml
 .tox
+.eggs/
 modoboa_test
 .coverage
 build/
diff --git a/.travis.yml b/.travis.yml
index ce4082016..4c3e5d745 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -36,6 +36,8 @@ install:
   - pip install -r requirements.txt
   - pip install -r ldap-requirements.txt
   - pip install -r test-requirements.txt
+  - if [ $DB = POSTGRESQL ]; then pip install -r postgresql-requirements.txt ; fi
+  - if [ $DB = MYSQL ]; then pip install -r mysql-requirements.txt ; fi
   - python setup.py develop
 
 before_script:
diff --git a/test-requirements.txt b/test-requirements.txt
index 80d2ae99c..00fae81e6 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -3,5 +3,3 @@ mock==2.0.0; python_version < '3.3'
 httmock==1.2.5
 testfixtures==4.7.0
 tox
-psycopg2-binary>=2.7.4
-mysqlclient>=1.3.3
diff --git a/tox.ini b/tox.ini
index 1f949ddfd..9f3dd8fc9 100644
--- a/tox.ini
+++ b/tox.ini
@@ -9,8 +9,11 @@ commands =
 
     coverage report --show-missing
 deps =
+    -r{toxinidir}/requirements.txt
     -r{toxinidir}/test-requirements.txt
     coverage
+    postgres: -r{toxinidir}/postgresql-requirements.txt
+    mysql: -r{toxinidir}/mysql-requirements.txt
 setenv =
     COVERAGE_FILE={envdir}/.coverage
     DB=SQLITE