diff options
| author | Craig Vyvial <cp16net@gmail.com> | 2016-02-01 12:02:25 -0600 |
|---|---|---|
| committer | Craig Vyvial <cp16net@gmail.com> | 2016-02-01 12:04:02 -0600 |
| commit | b01c7ff1b53ed81a3eb6e7ac0e5759ba11aff7aa (patch) | |
| tree | 825209e1ab2c81b0d870c44e21c0acd9db4c2da3 | |
| parent | b5e7c20bd893b2abf816ea432437607de00fe5a0 (diff) | |
| download | trove-integration-b01c7ff1b53ed81a3eb6e7ac0e5759ba11aff7aa.tar.gz | |
redstack repl is broken
remove the nova imports to get the repl to work.
Change-Id: Ie919b7ac1c95a2b69e7800cb2837ce0123e48690
| -rw-r--r-- | tests/integration/int_tests.py | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/tests/integration/int_tests.py b/tests/integration/int_tests.py index c1a0344..e8f00fc 100644 --- a/tests/integration/int_tests.py +++ b/tests/integration/int_tests.py @@ -82,11 +82,11 @@ MAIN_RUNNER = None def initialize_rdl_config(config_file): from trove.common import cfg - from trove.openstack.common import log + from oslo_log import log from trove.db import get_db_api conf = cfg.CONF cfg.parse_args(['int_tests'], default_config_files=[config_file]) - log.setup(None) + log.setup(conf, None) try: get_db_api().configure_db(conf) conf_file = conf.find_file(conf.api_paste_config) @@ -96,17 +96,6 @@ def initialize_rdl_config(config_file): sys.exit("ERROR: %s" % error) -def initialize_nova_flags(config_file): - from nova import flags - from nova import log as logging - from nova import service - from nova import utils - - flags.parse_args(['int_tests'], default_config_files=[config_file]) - logging.setup() - utils.monkey_patch() - - def _clean_up(): """Shuts down any services this program has started and shows results.""" from tests.util import report @@ -227,8 +216,6 @@ def run_main(test_importer): if CONFIG.white_box: # If white-box testing, set up the flags. # Handle loading up RDL's config file madness. initialize_rdl_config(rdl_config_file) - if nova_flag_file: - initialize_nova_flags(nova_flag_file) # Set up the report, and print out how we're running the tests. from tests.util import report |