From c6f49a6a8b6aac14c1d941ead5f1dcf7e2e1b563 Mon Sep 17 00:00:00 2001
From: Julien Danjou <julien@danjou.info>
Date: Thu, 17 Sep 2015 15:06:10 +0200
Subject: [PATCH] tox: generate config file on test run

We already do that for Aodh and Gnocchi, and that makes sure we don't
break the config generator when committing new things.

Change-Id: I049f86dc85d7d4c365cdd622cefd4025ae0cebc3
---
 generate-config-file.sh | 10 ++++++++++
 tox.ini                 | 12 ++----------
 2 files changed, 12 insertions(+), 10 deletions(-)
 create mode 100755 generate-config-file.sh

diff --git a/generate-config-file.sh b/generate-config-file.sh
new file mode 100755
index 00000000..7ad939f7
--- /dev/null
+++ b/generate-config-file.sh
@@ -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
diff --git a/tox.ini b/tox.ini
index b3d52771..8972808b 100644
--- a/tox.ini
+++ b/tox.ini
@@ -13,6 +13,7 @@ setenv = VIRTUAL_ENV={envdir}
          OS_TEST_PATH=ceilometer/tests/unit
 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
@@ -93,16 +94,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