summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-06-15 10:59:06 +0000
committerGerrit Code Review <review@openstack.org>2017-06-15 10:59:06 +0000
commita50314704563cbe7da74ae9ef53412e35f36c73b (patch)
tree9ba3ba5658260765b2b401f228237ae64cf9dbe6
parentf8b9d0ff3d1a36dae76b23dcd390daf1fc021813 (diff)
parent89b27980e288c1fd1030068f987dc16898b9c7c5 (diff)
Merge "remove tox warnning"
-rw-r--r--etc/vitrage/vitrage-config-generator.conf1
-rw-r--r--tox.ini2
2 files changed, 1 insertions, 2 deletions
diff --git a/etc/vitrage/vitrage-config-generator.conf b/etc/vitrage/vitrage-config-generator.conf
index 8ab6fd5..30499a4 100644
--- a/etc/vitrage/vitrage-config-generator.conf
+++ b/etc/vitrage/vitrage-config-generator.conf
@@ -3,7 +3,6 @@ output_file = etc/vitrage/vitrage.conf
3wrap_width = 79 3wrap_width = 79
4namespace = vitrage 4namespace = vitrage
5namespace = datasources 5namespace = datasources
6namespace = oslo.db
7namespace = oslo.log 6namespace = oslo.log
8namespace = oslo.middleware 7namespace = oslo.middleware
9namespace = oslo.policy 8namespace = oslo.policy
diff --git a/tox.ini b/tox.ini
index 3c80435..d940e4f 100644
--- a/tox.ini
+++ b/tox.ini
@@ -12,7 +12,7 @@ setenv =
12 DISCOVER_DIRECTORY=vitrage/tests 12 DISCOVER_DIRECTORY=vitrage/tests
13deps = -r{toxinidir}/test-requirements.txt 13deps = -r{toxinidir}/test-requirements.txt
14commands = 14commands =
15 rm -f .testrepository/times.dbm 15 /bin/rm -f .testrepository/times.dbm
16 python setup.py testr --slowest --testr-args='{posargs}' 16 python setup.py testr --slowest --testr-args='{posargs}'
17 oslo-config-generator --config-file=etc/vitrage/vitrage-config-generator.conf 17 oslo-config-generator --config-file=etc/vitrage/vitrage-config-generator.conf
18 18