From: Salvatore Orlando <sorlando@nicira.com>
Date: Tue, 14 Aug 2012 10:01:29 +0000 (-0700)
Subject: Allow extra config files in unit tests
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=7f28401e1ed2560424522c90c98df2813fdea53b;p=openstack-build%2Fneutron-build.git

Allow extra config files in unit tests

Fixes bug 1036669

Change-Id: Ic091ab012fbf6c80d2355806b6cd03a63fbfe4ca
---

diff --git a/quantum/tests/unit/test_db_plugin.py b/quantum/tests/unit/test_db_plugin.py
index 52c4f3fe5..e2bb8c466 100644
--- a/quantum/tests/unit/test_db_plugin.py
+++ b/quantum/tests/unit/test_db_plugin.py
@@ -71,6 +71,9 @@ class QuantumDbPluginV2TestCase(unittest2.TestCase):
         plugin = test_config.get('plugin_name_v2', DB_PLUGIN_KLASS)
         # Create the default configurations
         args = ['--config-file', etcdir('quantum.conf.test')]
+        # If test_config specifies some config-file, use it, as well
+        for config_file in test_config.get('config_files', []):
+            args.extend(['--config-file', config_file])
         config.parse(args=args)
         # Update the plugin
         cfg.CONF.set_override('core_plugin', plugin)