From 2673254c6f682bca8ea7be5ba50a154df4710427 Mon Sep 17 00:00:00 2001
From: Jedrzej Nowak <jnowak@mirantis.com>
Date: Thu, 17 Dec 2015 13:49:00 +0100
Subject: [PATCH] SOLAR_DB from env in testr execution if defined

Tox passes env SOLAR_DB to testenv,

Change-Id: Ib267fcd3b6df1133ac592f41aa4a9a407de23e03
---
 .testr.conf | 2 +-
 tox.ini     | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.testr.conf b/.testr.conf
index 37e1b0b1..c65c9314 100644
--- a/.testr.conf
+++ b/.testr.conf
@@ -1,5 +1,5 @@
 [DEFAULT]
-test_command=SOLAR_DB="sqlite://" \
+test_command=SOLAR_DB=${SOLAR_DB:=sqlite://} \
              py.test ./solar --subunit $LISTOPT $IDOPTION
 test_id_option=--subunit-load-list=$IDFILE
 test_list_option=--collectonly
diff --git a/tox.ini b/tox.ini
index 2a38889f..1610cec6 100644
--- a/tox.ini
+++ b/tox.ini
@@ -7,6 +7,7 @@ envlist = pep8,py27
 usedevelop = True
 install_command = pip install -U {opts} {packages}
 setenv = VIRTUAL_ENV={envdir}
+passenv = SOLAR_DB
 deps = -r{toxinidir}/test-requirements.txt
 commands = ostestr