From e4df5d695c15078e2eac23243c9956688805d43b Mon Sep 17 00:00:00 2001 From: Nguyen Phuong An Date: Wed, 5 Sep 2018 01:13:18 +0000 Subject: [PATCH] Follow-up: add fullstack test for logging This patch corrects log path and remove redundant code in scenario. Change-Id: Id59a60b3562e3104b682d42cddc95738b3c3ba14 --- neutron/tests/fullstack/resources/config.py | 4 +++- neutron/tests/fullstack/test_logging.py | 8 +------- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/neutron/tests/fullstack/resources/config.py b/neutron/tests/fullstack/resources/config.py index ac71532bfc6..a7fcc3d045a 100644 --- a/neutron/tests/fullstack/resources/config.py +++ b/neutron/tests/fullstack/resources/config.py @@ -20,6 +20,7 @@ from neutron_lib import constants from neutron.common import utils from neutron.plugins.ml2.extensions import qos as qos_ext +from neutron.tests import base from neutron.tests.common import config_fixtures from neutron.tests.common.exclusive_resources import port from neutron.tests.common import helpers as c_helpers @@ -193,6 +194,7 @@ class OVSConfigFixture(ConfigFixture): if env_desc.log: self.config['agent']['extensions'] = 'log' test_name = kwargs.get("test_name") + test_name = base.sanitize_log_path(test_name) self.config.update({ 'network_log': { 'local_output_log_base': @@ -224,7 +226,7 @@ class OVSConfigFixture(ConfigFixture): return utils.get_rand_device_name(prefix='patch-int') def _generate_temp_log_file(self, test_name): - log_dir_path = fullstack_base.DEFAULT_LOG_DIR + '/' + test_name + log_dir_path = os.path.join(fullstack_base.DEFAULT_LOG_DIR, test_name) if not os.path.exists(log_dir_path): os.mkdir(log_dir_path, 0o755) return '%s/%s.log' % (log_dir_path, diff --git a/neutron/tests/fullstack/test_logging.py b/neutron/tests/fullstack/test_logging.py index 0567c5fde78..57c1017ea0a 100644 --- a/neutron/tests/fullstack/test_logging.py +++ b/neutron/tests/fullstack/test_logging.py @@ -24,9 +24,6 @@ from neutron.tests.common import net_helpers from neutron.tests.fullstack import base from neutron.tests.fullstack.resources import environment from neutron.tests.fullstack.resources import machine -from neutron.tests.unit import testlib_api - -load_tests = testlib_api.module_load_tests class BaseLoggingTestCase(base.BaseFullStackTestCase): @@ -93,10 +90,7 @@ class BaseLoggingTestCase(base.BaseFullStackTestCase): class TestLogging(BaseLoggingTestCase): - - scenarios = [ - ('ovs-openflow-native', { - 'of_interface': 'native'})] + of_interface = 'native' def _create_network_log(self, resource_type, resource_id=None, target_id=None):