openstack/ceilometer
Code Issues Proposed changes

tests: replace overtest by pifpaf

Browse Source 
Change-Id: Ib26c9c674d438bcbabea9c09cfdab97516e0e227
This commit is contained in:
Julien Danjou 2016-05-02 18:06:52 +02:00
parent 3c3eb009ac
commit 15a424c2e9
5 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ceilometer/tests/db.py
View File

@ -180,7 +180,7 @@ class TestBase(test_base.BaseTestCase):
def setUp(self):
super(TestBase, self).setUp()
db_url = os.environ.get('OVERTEST_URL', "sqlite://").replace(
db_url = os.environ.get('PIFPAF_URL', "sqlite://").replace(
"mysql://", "mysql+pymysql://")
engine = urlparse.urlparse(db_url).scheme

2
ceilometer/tests/functional/gabbi/fixtures.py
View File

@ -49,7 +49,7 @@ class ConfigFixture(fixture.GabbiFixture):
self.conf = None
# Determine the database connection.
db_url = os.environ.get('OVERTEST_URL', "sqlite://").replace(
db_url = os.environ.get('PIFPAF_URL', "sqlite://").replace(
"mysql://", "mysql+pymysql://")
if not db_url:
raise case.SkipTest('No database connection configured')

2
run-functional-tests.sh
View File

@ -7,5 +7,5 @@ if [ -z $CEILOMETER_TEST_BACKEND ]; then
fi
for backend in $CEILOMETER_TEST_BACKEND; do
overtest $backend ./tools/pretty_tox.sh $*
pifpaf run $backend ./tools/pretty_tox.sh $*
done

2
test-requirements.txt
View File

@ -16,7 +16,6 @@ oslosphinx!=3.4.0,>=2.5.0 # Apache-2.0
reno>=1.6.2 # Apache2
oslotest>=1.10.0 # Apache-2.0
oslo.vmware>=1.16.0 # Apache-2.0
overtest>=0.10.0 # Apache-2.0
psycopg2>=2.5 # LGPL/ZPL
pymongo!=3.1,>=3.0.2 # Apache-2.0
gnocchiclient>=2.2.0 # Apache-2.0
@ -31,3 +30,4 @@ gabbi>=1.11.0 # Apache-2.0
requests-aws>=0.1.4 # BSD License (3 clause)
os-testr>=0.4.1 # Apache-2.0
WebTest>=2.0 # MIT
pifpaf>=0.0.11

18
tox.ini
View File

@ -18,20 +18,20 @@ whitelist_externals = bash
[testenv:py-mongodb]
setenv = OS_TEST_PATH=ceilometer/tests/functional/
commands = overtest mongodb {toxinidir}/tools/pretty_tox.sh "{posargs}"
commands = pifpaf run mongodb {toxinidir}/tools/pretty_tox.sh "{posargs}"
[testenv:py-mysql]
setenv = OS_TEST_PATH=ceilometer/tests/functional/
commands = overtest mysql {toxinidir}/tools/pretty_tox.sh "{posargs}"
commands = pifpaf run mysql {toxinidir}/tools/pretty_tox.sh "{posargs}"
[testenv:py-pgsql]
setenv = OS_TEST_PATH=ceilometer/tests/functional/
commands = overtest postgresql {toxinidir}/tools/pretty_tox.sh "{posargs}"
commands = pifpaf run postgresql {toxinidir}/tools/pretty_tox.sh "{posargs}"
# Functional tests for elastic search
[testenv:py-elastic]
setenv = OS_TEST_PATH=ceilometer/tests/functional/
commands = overtest elasticsearch {toxinidir}/tools/pretty_tox.sh "{posargs}"
commands = pifpaf run elasticsearch {toxinidir}/tools/pretty_tox.sh "{posargs}"
[testenv:functional]
setenv = VIRTUAL_ENV={envdir}
@ -67,7 +67,7 @@ commands =
[testenv:gabbi]
setenv = OS_TEST_PATH=ceilometer/tests/functional/gabbi
passenv = CEILOMETER_*
commands = overtest mongodb {toxinidir}/tools/pretty_tox.sh "{posargs}"
commands = pifpaf run mongodb {toxinidir}/tools/pretty_tox.sh "{posargs}"
[testenv:cover]
setenv = OS_TEST_PATH=ceilometer/tests
@ -100,19 +100,19 @@ commands = bash -x oslo_debug_helper {posargs}
[testenv:debug-mongodb]
setenv = OS_TEST_PATH=ceilometer/tests/functional
commands = overtest mongodb oslo_debug_helper {posargs}
commands = pifpaf --debug run mongodb oslo_debug_helper {posargs}
[testenv:debug-mysql]
setenv = OS_TEST_PATH=ceilometer/tests/functional
commands = overtest mysql oslo_debug_helper {posargs}
commands = pifpaf --debug run mysql oslo_debug_helper {posargs}
[testenv:debug-pgsql]
setenv = OS_TEST_PATH=ceilometer/tests/functional
commands = overtest postgresql oslo_debug_helper {posargs}
commands = pifpaf --debug run postgresql oslo_debug_helper {posargs}
[testenv:debug-elastic]
setenv = OS_TEST_PATH=ceilometer/tests/functional
commands = overtest elasticsearch oslo_debug_helper {posargs}
commands = pifpaf --debug run elasticsearch oslo_debug_helper {posargs}
[flake8]
ignore =