openstack/rally-openstack
Code Issues Proposed changes

Allow setting DB for unittests via env & add psql support

Browse Source 
RALLY_UNITTEST_DB_URL may be used to change test database.

Sample usage:

export RALLY_UNITTEST_DB_URL="mysql://user:secret@localhost/rally"
tox -epy27

Fix postgress related bugs in unit tests.

* All enums should have name
* Fix invalid unit tests

Closes-bug: #1413155
Partial-bug: #1405884

Co-Authored-By: Sergey Skripnick <sskripnick@mirantis.com>
Co-Authored-By: Boris Pavlovic <boris@pavlovic.me>

Change-Id: Ic741cb79eadf952c3dea99182c1e7d52992c9904
This commit is contained in:
Sergey Skripnick 2015-01-21 14:14:51 +02:00 committed by Boris Pavlovic
parent 8170d14b60
commit 5533dea487
3 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
requirements.txt
View File

@ -18,6 +18,7 @@ pbr>=0.6,!=0.7,<1.0
pecan>=0.8.0
PrettyTable>=0.7,<0.8
PyYAML>=3.1.0
psycopg2
python-designateclient>=1.0.0
python-glanceclient>=0.15.0
python-keystoneclient>=0.11.1

5
tests/README.rst
View File

@ -31,6 +31,11 @@ To run py26, py27 or pep8 only::
#NOTE: <name> is one of py26, py27 or pep8
To run py26, py27 against mysql or psql
$ export RALLY_UNITTEST_DB_URL="mysql://user:secret@localhost/rally"
$ tox -epy27
To get test coverage::
$ tox -e cover

5
tests/unit/test.py
View File

@ -13,6 +13,8 @@
# License for the specific language governing permissions and limitations
# under the License.
import os
import mock
from oslo.config import fixture
from oslotest import base
@ -24,8 +26,9 @@ class DatabaseFixture(fixture.Config):
"""Create clean DB before starting test."""
def setUp(self):
super(DatabaseFixture, self).setUp()
db_url = os.environ.get("RALLY_UNITTEST_DB_URL", "sqlite://")
db.db_cleanup()
self.conf.set_default('connection', "sqlite://", group='database')
self.conf.set_default("connection", db_url, group="database")
db.db_drop()
db.db_create()