Merge "tox: generate config file on test run"

This commit is contained in:
Jenkins 2015-09-21 13:45:24 +00:00 committed by Gerrit Code Review
commit 1f342ef3e2
2 changed files with 12 additions and 10 deletions

10
generate-config-file.sh Executable file
View File

@ -0,0 +1,10 @@
#!/bin/sh
oslo-config-generator --output-file etc/ceilometer/ceilometer.conf \
--namespace ceilometer \
--namespace oslo.concurrency \
--namespace oslo.db \
--namespace oslo.log \
--namespace oslo.messaging \
--namespace oslo.policy \
--namespace oslo.service.service \
--namespace keystonemiddleware.auth_token

12
tox.ini
View File

@ -14,6 +14,7 @@ setenv = VIRTUAL_ENV={envdir}
passenv = OS_TEST_TIMEOUT OS_STDOUT_CAPTURE OS_STDERR_CAPTURE OS_LOG_CAPTURE
commands =
python setup.py testr --slowest --testr-args="{posargs}"
{toxinidir}/generate-config-file.sh
whitelist_externals = bash
# TODO(ityaptin): With separation tests to unit and functional folders we need
@ -94,16 +95,7 @@ commands =
bash -c "find ceilometer -type f -regex '.*\.pot?' -print0|xargs -0 -n 1 msgfmt --check-format -o /dev/null"
[testenv:genconfig]
commands =
oslo-config-generator --output-file etc/ceilometer/ceilometer.conf \
--namespace ceilometer \
--namespace oslo.concurrency \
--namespace oslo.db \
--namespace oslo.log \
--namespace oslo.messaging \
--namespace oslo.policy \
--namespace oslo.service.service \
--namespace keystonemiddleware.auth_token
commands = {toxinidir}/generate-config-file.sh
[testenv:docs]
commands = python setup.py build_sphinx