diff --git a/quantum/tests/unit/__init__.py b/quantum/tests/unit/__init__.py index 50375f4054..feeb9d3e96 100644 --- a/quantum/tests/unit/__init__.py +++ b/quantum/tests/unit/__init__.py @@ -22,6 +22,14 @@ import __builtin__ import unittest setattr(__builtin__, '_', lambda x: x) +import os +from quantum.common import flags + +FLAGS = flags.FLAGS +reldir = os.path.join(os.path.dirname(__file__), '..', '..', '..') +absdir = os.path.abspath(reldir) +FLAGS.state_path = absdir + class BaseTest(unittest.TestCase): diff --git a/quantum/tests/unit/test_extensions.py b/quantum/tests/unit/test_extensions.py index cc5fe4b313..5a60fb13a1 100644 --- a/quantum/tests/unit/test_extensions.py +++ b/quantum/tests/unit/test_extensions.py @@ -41,14 +41,6 @@ from quantum.extensions.extensions import (ExtensionManager, ExtensionMiddleware) LOG = logging.getLogger('test_extensions') - -from quantum.common import flags -FLAGS = flags.FLAGS - -quantum_dir = os.path.dirname(os.path.abspath(quantum.__file__)) -src_dir = os.path.abspath(os.path.join(quantum_dir, "..")) -FLAGS.state_path = src_dir - test_conf_file = config.find_config_file({}, None, "quantum.conf.test") extensions_path = ':'.join(quantum.tests.unit.extensions.__path__)