diff options
| author | Diana Clarke <diana.joan.clarke@gmail.com> | 2016-02-15 00:43:19 -0500 |
|---|---|---|
| committer | Diana Clarke <diana.joan.clarke@gmail.com> | 2016-02-15 09:07:23 -0500 |
| commit | a82ed4fd35f5be06a4e587e8a2acc1552815f3b5 (patch) | |
| tree | 2f64653a0a2c80ef18a763d780302fa05472d148 /nova/config.py | |
| parent | dd03245bf12a512ecb7d8f5b479950288ef3beac (diff) | |
| download | nova-a82ed4fd35f5be06a4e587e8a2acc1552815f3b5.tar.gz | |
rpc.init() is being called twice per test
setUp calls rpc.init() twice for each test, once in each of:
self.useFixture(conf_fixture.ConfFixture(CONF))
self.useFixture(nova_fixtures.RPCFixture('nova.test'))
Stop calling rpc.init() in ConfFixture, and defer to RPCFixture for
initialization.
The calls to rpc.init() in ConfFixture were taking 0.01 seconds each.
0.01 seconds * 14784 tests = 2.5 minutes
Change-Id: I710399b9b9286884f3ed71522d2697680951c20e
Diffstat (limited to 'nova/config.py')
| -rw-r--r-- | nova/config.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/nova/config.py b/nova/config.py index efb89cf7be..b9c025915a 100644 --- a/nova/config.py +++ b/nova/config.py @@ -48,7 +48,8 @@ _DEFAULT_LOGGING_CONTEXT_FORMAT = ('%(asctime)s.%(msecs)03d %(process)d ' '%(message)s') -def parse_args(argv, default_config_files=None, configure_db=True): +def parse_args(argv, default_config_files=None, configure_db=True, + init_rpc=True): log.set_defaults(_DEFAULT_LOGGING_CONTEXT_FORMAT, _DEFAULT_LOG_LEVELS) log.register_options(CONF) options.set_defaults(CONF, connection=_DEFAULT_SQL_CONNECTION, @@ -60,7 +61,9 @@ def parse_args(argv, default_config_files=None, configure_db=True): project='nova', version=version.version_string(), default_config_files=default_config_files) - rpc.init(CONF) + + if init_rpc: + rpc.init(CONF) if configure_db: sqlalchemy_api.configure(CONF) |