From: Joe Gordon <joe.gordon0@gmail.com>
Date: Wed, 2 Apr 2014 18:25:27 +0000 (-0700)
Subject: Explicitly import state_path opt in tests.base
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=c20036e407cd5f80b1d42344c6af1c8c41416e66;p=openstack-build%2Fneutron-build.git

Explicitly import state_path opt in tests.base

This wasn't explicitly needed in the unit tests because
neutron.common.config was already loaded, but this broke for the
functional tests (which are non-voting) so add a CONF.import_opt line so
functional tests know where to find the definition for state_path.

Closes-Bug: #1322440

Change-Id: I5b87a75317e2ba670adaa59b251bfa860920fd61
(cherry picked from commit f6dfc3a901ce7536a72e6159583051e9bcaf8d8f)
---

diff --git a/neutron/tests/base.py b/neutron/tests/base.py
index a65e89cab..69b1b84bb 100644
--- a/neutron/tests/base.py
+++ b/neutron/tests/base.py
@@ -36,6 +36,7 @@ from neutron.tests import post_mortem_debug
 
 
 CONF = cfg.CONF
+CONF.import_opt('state_path', 'neutron.common.config')
 TRUE_STRING = ['True', '1']
 LOG_FORMAT = "%(asctime)s %(levelname)8s [%(name)s] %(message)s"