diff options
| author | Ihar Hrachyshka <ihrachys@redhat.com> | 2016-05-26 13:16:30 +0200 |
|---|---|---|
| committer | Ihar Hrachyshka <ihrachys@redhat.com> | 2016-05-26 15:01:08 +0000 |
| commit | 22da3db98b8699f48d93892007e6a93340a3913c (patch) | |
| tree | afa564054b3721aff4b71a1637ace10c8c756588 /neutron/tests | |
| parent | bbebfcccbe7fb5f9e3c4913751db2d4615694801 (diff) | |
| download | neutron-22da3db98b8699f48d93892007e6a93340a3913c.tar.gz | |
oslo: remove usage of oslo.log verbose option
The option was deprecated a long time ago, and will be removed in one of
the next library releases, which will render neutron broken if we keep
using the option.
More details:
http://lists.openstack.org/pipermail/openstack-dev/2016-May/095166.html
Closes-Bug: #1586066
Change-Id: I884b4cc3ed04e4b5489e265c146666e04eb1bc27
Diffstat (limited to 'neutron/tests')
| -rw-r--r-- | neutron/tests/fullstack/resources/config.py | 2 | ||||
| -rw-r--r-- | neutron/tests/unit/agent/dhcp/test_agent.py | 8 | ||||
| -rw-r--r-- | neutron/tests/unit/agent/metadata/test_driver.py | 1 |
3 files changed, 0 insertions, 11 deletions
diff --git a/neutron/tests/fullstack/resources/config.py b/neutron/tests/fullstack/resources/config.py index ea9909c416..ff89ff41d9 100644 --- a/neutron/tests/fullstack/resources/config.py +++ b/neutron/tests/fullstack/resources/config.py @@ -68,7 +68,6 @@ class NeutronConfigFixture(ConfigFixture): 'core_plugin': 'neutron.plugins.ml2.plugin.Ml2Plugin', 'service_plugins': ','.join(service_plugins), 'auth_strategy': 'noauth', - 'verbose': 'True', 'debug': 'True', }, 'database': { @@ -259,7 +258,6 @@ class L3ConfigFixture(ConfigFixture): self._prepare_config_with_linuxbridge_agent() self.config['DEFAULT'].update({ 'debug': 'True', - 'verbose': 'True', 'test_namespace_suffix': self._generate_namespace_suffix(), }) diff --git a/neutron/tests/unit/agent/dhcp/test_agent.py b/neutron/tests/unit/agent/dhcp/test_agent.py index 213784faa0..0cd5bb8415 100644 --- a/neutron/tests/unit/agent/dhcp/test_agent.py +++ b/neutron/tests/unit/agent/dhcp/test_agent.py @@ -540,7 +540,6 @@ class TestLogArgs(base.BaseTestCase): def test_log_args_without_log_dir_and_file(self): conf_dict = {'debug': True, - 'verbose': False, 'log_dir': None, 'log_file': None, 'use_syslog': True, @@ -554,14 +553,12 @@ class TestLogArgs(base.BaseTestCase): def test_log_args_without_log_file(self): conf_dict = {'debug': True, - 'verbose': True, 'log_dir': '/etc/tests', 'log_file': None, 'use_syslog': False, 'syslog_log_facility': 'LOG_USER'} conf = dhcp.DictModel(conf_dict) expected_args = ['--debug', - '--verbose', '--log-file=log_file_name', '--log-dir=/etc/tests'] args = config.get_log_args(conf, 'log_file_name') @@ -569,7 +566,6 @@ class TestLogArgs(base.BaseTestCase): def test_log_args_with_log_dir_and_file(self): conf_dict = {'debug': True, - 'verbose': False, 'log_dir': '/etc/tests', 'log_file': 'tests/filelog', 'use_syslog': False, @@ -583,7 +579,6 @@ class TestLogArgs(base.BaseTestCase): def test_log_args_without_log_dir(self): conf_dict = {'debug': True, - 'verbose': False, 'log_file': 'tests/filelog', 'log_dir': None, 'use_syslog': False, @@ -597,14 +592,12 @@ class TestLogArgs(base.BaseTestCase): def test_log_args_with_filelog_and_syslog(self): conf_dict = {'debug': True, - 'verbose': True, 'log_file': 'tests/filelog', 'log_dir': '/etc/tests', 'use_syslog': True, 'syslog_log_facility': 'LOG_USER'} conf = dhcp.DictModel(conf_dict) expected_args = ['--debug', - '--verbose', '--log-file=log_file_name', '--log-dir=/etc/tests/tests'] args = config.get_log_args(conf, 'log_file_name') @@ -852,7 +845,6 @@ class TestDhcpAgentEventHandler(base.BaseTestCase): def _test_enable_isolated_metadata_proxy(self, network): cfg.CONF.set_override('enable_metadata_network', True) cfg.CONF.set_override('debug', True) - cfg.CONF.set_override('verbose', False) cfg.CONF.set_override('log_file', 'test.log') method_path = ('neutron.agent.metadata.driver.MetadataDriver' '.spawn_monitored_metadata_proxy') diff --git a/neutron/tests/unit/agent/metadata/test_driver.py b/neutron/tests/unit/agent/metadata/test_driver.py index c38f54776c..269884810c 100644 --- a/neutron/tests/unit/agent/metadata/test_driver.py +++ b/neutron/tests/unit/agent/metadata/test_driver.py @@ -115,7 +115,6 @@ class TestMetadataDriverProcess(base.BaseTestCase): '--metadata_proxy_user=%s' % expected_user, '--metadata_proxy_group=%s' % expected_group, '--debug', - '--verbose', '--log-file=neutron-ns-metadata-proxy-%s.log' % router_id] if not watch_log: |