[refactor] common/test_config: Remove duplicated config declaration in tests
* Added setUp() call * Moved declaration of config to setUp() * config -> self.config Change-Id: I07a663552c5b6333630f381961411acd8ec39f73 Partial-Bug: #1714012
This commit is contained in:
parent
46ea48fb44
commit
e4c6469429
@ -73,6 +73,10 @@ class MockCollectdConfig(object):
|
|||||||
class TestConfig(TestCase):
|
class TestConfig(TestCase):
|
||||||
"""Test configuration reader"""
|
"""Test configuration reader"""
|
||||||
|
|
||||||
|
def setUp(self):
|
||||||
|
super(TestConfig, self).setUp()
|
||||||
|
self.config = settings.Config._decorated()
|
||||||
|
|
||||||
@property
|
@property
|
||||||
def default_values(self):
|
def default_values(self):
|
||||||
return dict(
|
return dict(
|
||||||
@ -90,19 +94,20 @@ class TestConfig(TestCase):
|
|||||||
"""Test valid configuration"""
|
"""Test valid configuration"""
|
||||||
|
|
||||||
node = config_module(values=self.default_values)
|
node = config_module(values=self.default_values)
|
||||||
config = settings.Config._decorated()
|
updated_node = config_module(values=dict(BATCH_SIZE=10))
|
||||||
|
|
||||||
# read default configuration
|
# read default configuration
|
||||||
config.read(node)
|
self.config.read(node)
|
||||||
|
|
||||||
# compare the configuration values with the default values
|
# compare the configuration values with the default values
|
||||||
for key, value in six.iteritems(self.default_values):
|
for key, value in six.iteritems(self.default_values):
|
||||||
self.assertEqual(value, getattr(config, key))
|
self.assertEqual(value, getattr(self.config, key))
|
||||||
|
|
||||||
# test configuration change
|
# test configuration change
|
||||||
self.assertEqual(1, config.BATCH_SIZE)
|
self.assertEqual(1, self.config.BATCH_SIZE)
|
||||||
config.read(config_module(values=dict(BATCH_SIZE=10)))
|
|
||||||
self.assertEqual(10, config.BATCH_SIZE)
|
self.config.read(updated_node)
|
||||||
|
self.assertEqual(10, self.config.BATCH_SIZE)
|
||||||
LOGGER.error.assert_not_called()
|
LOGGER.error.assert_not_called()
|
||||||
|
|
||||||
def test_singleton(self):
|
def test_singleton(self):
|
||||||
@ -131,13 +136,12 @@ class TestConfig(TestCase):
|
|||||||
values = self.default_values
|
values = self.default_values
|
||||||
values["BATCH_SIZE"] = "xyz"
|
values["BATCH_SIZE"] = "xyz"
|
||||||
node = config_module(values=values)
|
node = config_module(values=values)
|
||||||
config = settings.Config._decorated()
|
|
||||||
|
|
||||||
config.read(node)
|
self.config.read(node)
|
||||||
|
|
||||||
LOGGER.error.assert_called_once_with(
|
LOGGER.error.assert_called_once_with(
|
||||||
'Invalid value "xyz" for configuration parameter "BATCH_SIZE"')
|
'Invalid value "xyz" for configuration parameter "BATCH_SIZE"')
|
||||||
self.assertEqual(1, config.BATCH_SIZE)
|
self.assertEqual(1, self.config.BATCH_SIZE)
|
||||||
|
|
||||||
@mock.patch.object(settings, 'LOGGER', autospec=True)
|
@mock.patch.object(settings, 'LOGGER', autospec=True)
|
||||||
def test_unknown_parameter(self, LOGGER):
|
def test_unknown_parameter(self, LOGGER):
|
||||||
@ -148,9 +152,8 @@ class TestConfig(TestCase):
|
|||||||
values = self.default_values
|
values = self.default_values
|
||||||
values["UNKNOWN"] = "xyz"
|
values["UNKNOWN"] = "xyz"
|
||||||
node = config_module(values=values)
|
node = config_module(values=values)
|
||||||
config = settings.Config._decorated()
|
|
||||||
|
|
||||||
config.read(node)
|
self.config.read(node)
|
||||||
|
|
||||||
LOGGER.error.assert_called_with(
|
LOGGER.error.assert_called_with(
|
||||||
'Unknown configuration parameter "%s"', 'UNKNOWN')
|
'Unknown configuration parameter "%s"', 'UNKNOWN')
|
||||||
@ -166,9 +169,8 @@ class TestConfig(TestCase):
|
|||||||
if child.key == 'OS_AUTH_URL':
|
if child.key == 'OS_AUTH_URL':
|
||||||
child.values = tuple()
|
child.values = tuple()
|
||||||
break
|
break
|
||||||
config = settings.Config._decorated()
|
|
||||||
|
|
||||||
config.read(node)
|
self.config.read(node)
|
||||||
|
|
||||||
LOGGER.error.assert_has_calls([
|
LOGGER.error.assert_has_calls([
|
||||||
mock.call('No configuration value found for "%s"', "OS_AUTH_URL"),
|
mock.call('No configuration value found for "%s"', "OS_AUTH_URL"),
|
||||||
@ -184,16 +186,15 @@ class TestConfig(TestCase):
|
|||||||
units={'age': 'years',
|
units={'age': 'years',
|
||||||
'star.distance': 'LY',
|
'star.distance': 'LY',
|
||||||
'star.temperature': 'K'})
|
'star.temperature': 'K'})
|
||||||
config = settings.Config._decorated()
|
|
||||||
|
|
||||||
config.read(node)
|
self.config.read(node)
|
||||||
|
|
||||||
LOGGER.error.assert_not_called()
|
LOGGER.error.assert_not_called()
|
||||||
self.assertEqual('years', config.unit('age', None))
|
self.assertEqual('years', self.config.unit('age', None))
|
||||||
self.assertEqual('LY', config.unit('star', 'distance'))
|
self.assertEqual('LY', self.config.unit('star', 'distance'))
|
||||||
self.assertEqual('K', config.unit('star', 'temperature'))
|
self.assertEqual('K', self.config.unit('star', 'temperature'))
|
||||||
self.assertEqual('None', config.unit('monty', None))
|
self.assertEqual('None', self.config.unit('monty', None))
|
||||||
self.assertEqual('None', config.unit('monty', 'python'))
|
self.assertEqual('None', self.config.unit('monty', 'python'))
|
||||||
|
|
||||||
@mock.patch.object(settings, 'LOGGER', autospec=True)
|
@mock.patch.object(settings, 'LOGGER', autospec=True)
|
||||||
def test_user_units_invalid(self, LOGGER):
|
def test_user_units_invalid(self, LOGGER):
|
||||||
@ -209,11 +210,10 @@ class TestConfig(TestCase):
|
|||||||
if child.key == 'UNITS':
|
if child.key == 'UNITS':
|
||||||
child.children[0].values = (1, 2, 3)
|
child.children[0].values = (1, 2, 3)
|
||||||
break
|
break
|
||||||
config = settings.Config._decorated()
|
|
||||||
|
|
||||||
config.read(node)
|
self.config.read(node)
|
||||||
|
|
||||||
self.assertEqual('None', config.unit('age', None))
|
self.assertEqual('None', self.config.unit('age', None))
|
||||||
LOGGER.error.assert_called_with(
|
LOGGER.error.assert_called_with(
|
||||||
'Invalid unit configuration: unit "1" "2" "3"')
|
'Invalid unit configuration: unit "1" "2" "3"')
|
||||||
|
|
||||||
@ -228,13 +228,12 @@ class TestConfig(TestCase):
|
|||||||
if child.key == 'UNITS':
|
if child.key == 'UNITS':
|
||||||
child.children[0].key = 'NOT_UNITS'
|
child.children[0].key = 'NOT_UNITS'
|
||||||
break
|
break
|
||||||
config = settings.Config._decorated()
|
|
||||||
|
|
||||||
config.read(node)
|
self.config.read(node)
|
||||||
|
|
||||||
LOGGER.error.assert_called_with(
|
LOGGER.error.assert_called_with(
|
||||||
'Invalid unit configuration: %s', "NOT_UNITS")
|
'Invalid unit configuration: %s', "NOT_UNITS")
|
||||||
self.assertEqual('None', config.unit('age', None))
|
self.assertEqual('None', self.config.unit('age', None))
|
||||||
|
|
||||||
def test_libvirt_meter_enabled(self):
|
def test_libvirt_meter_enabled(self):
|
||||||
"""Test configuration change when enabling the libvirt meter
|
"""Test configuration change when enabling the libvirt meter
|
||||||
@ -245,10 +244,9 @@ class TestConfig(TestCase):
|
|||||||
"""
|
"""
|
||||||
|
|
||||||
node = config_module(values=dict(LIBVIRT_METER_ENABLED=True))
|
node = config_module(values=dict(LIBVIRT_METER_ENABLED=True))
|
||||||
config = settings.Config._decorated()
|
|
||||||
|
|
||||||
config.read(config_module(values=dict(LIBVIRT_METER_ENABLED=True)))
|
self.config.read(node)
|
||||||
self.assertEqual(True, config.LIBVIRT_METER_ENABLED)
|
self.assertEqual(True, self.config.LIBVIRT_METER_ENABLED)
|
||||||
|
|
||||||
@mock.patch.object(settings, 'LOGGER', autospec=True)
|
@mock.patch.object(settings, 'LOGGER', autospec=True)
|
||||||
def test_libvirt_meter_default_config(self, LOGGER):
|
def test_libvirt_meter_default_config(self, LOGGER):
|
||||||
@ -261,13 +259,12 @@ class TestConfig(TestCase):
|
|||||||
"""
|
"""
|
||||||
|
|
||||||
node = config_module(values=self.default_values)
|
node = config_module(values=self.default_values)
|
||||||
config = settings.Config._decorated()
|
|
||||||
|
|
||||||
for child in node.children:
|
for child in node.children:
|
||||||
if child.key == 'LIBVIRT_METER_ENABLED':
|
if child.key == 'LIBVIRT_METER_ENABLED':
|
||||||
config.libvirt_meter = getattr(config, child.key)
|
self.config.libvirt_meter = getattr(self.config, child.key)
|
||||||
|
|
||||||
config.read(node)
|
self.config.read(node)
|
||||||
|
|
||||||
self.assertEqual(False, config.libvirt_meter)
|
self.assertEqual(False, self.config.libvirt_meter)
|
||||||
LOGGER.error.assert_not_called()
|
LOGGER.error.assert_not_called()
|
||||||
|
Loading…
Reference in New Issue
Block a user