simplify test data generation
Change-Id: I611ce1974b62719030b5ff41e694eade5fda8abc
This commit is contained in:
gord chung
parent
8f7694d7a5
commit
5f98f16c54
|
|
@ -31,21 +31,21 @@ from ceilometer import service
|
|||
from ceilometer.tests import base
|
||||
|
||||
|
||||
default_test_data = sample.Sample(
|
||||
name='test',
|
||||
type=sample.TYPE_CUMULATIVE,
|
||||
unit='',
|
||||
volume=1,
|
||||
user_id='test',
|
||||
project_id='test',
|
||||
resource_id='test_run_tasks',
|
||||
timestamp=datetime.datetime.utcnow().isoformat(),
|
||||
resource_metadata={'name': 'Pollster'},
|
||||
)
|
||||
def default_test_data(name='test'):
|
||||
return sample.Sample(
|
||||
name=name,
|
||||
type=sample.TYPE_CUMULATIVE,
|
||||
unit='',
|
||||
volume=1,
|
||||
user_id='test',
|
||||
project_id='test',
|
||||
resource_id='test_run_tasks',
|
||||
timestamp=datetime.datetime.utcnow().isoformat(),
|
||||
resource_metadata={'name': 'Pollster'})
|
||||
|
||||
|
||||
class TestPollster(plugin_base.PollsterBase):
|
||||
test_data = default_test_data
|
||||
test_data = default_test_data()
|
||||
discovery = None
|
||||
|
||||
@property
|
||||
|
|
@ -62,7 +62,7 @@ class TestPollster(plugin_base.PollsterBase):
|
|||
|
||||
|
||||
class BatchTestPollster(TestPollster):
|
||||
test_data = default_test_data
|
||||
test_data = default_test_data()
|
||||
discovery = None
|
||||
|
||||
@property
|
||||
|
|
@ -107,54 +107,27 @@ class BaseAgentManagerTestCase(base.BaseTestCase):
|
|||
class Pollster(TestPollster):
|
||||
samples = []
|
||||
resources = []
|
||||
test_data = default_test_data
|
||||
test_data = default_test_data()
|
||||
|
||||
class BatchPollster(BatchTestPollster):
|
||||
samples = []
|
||||
resources = []
|
||||
test_data = default_test_data
|
||||
test_data = default_test_data()
|
||||
|
||||
class PollsterAnother(TestPollster):
|
||||
samples = []
|
||||
resources = []
|
||||
test_data = sample.Sample(
|
||||
name='testanother',
|
||||
type=default_test_data.type,
|
||||
unit=default_test_data.unit,
|
||||
volume=default_test_data.volume,
|
||||
user_id=default_test_data.user_id,
|
||||
project_id=default_test_data.project_id,
|
||||
resource_id=default_test_data.resource_id,
|
||||
timestamp=default_test_data.timestamp,
|
||||
resource_metadata=default_test_data.resource_metadata)
|
||||
test_data = default_test_data('testanother')
|
||||
|
||||
class PollsterException(TestPollsterException):
|
||||
samples = []
|
||||
resources = []
|
||||
test_data = sample.Sample(
|
||||
name='testexception',
|
||||
type=default_test_data.type,
|
||||
unit=default_test_data.unit,
|
||||
volume=default_test_data.volume,
|
||||
user_id=default_test_data.user_id,
|
||||
project_id=default_test_data.project_id,
|
||||
resource_id=default_test_data.resource_id,
|
||||
timestamp=default_test_data.timestamp,
|
||||
resource_metadata=default_test_data.resource_metadata)
|
||||
test_data = default_test_data('testexception')
|
||||
|
||||
class PollsterExceptionAnother(TestPollsterException):
|
||||
samples = []
|
||||
resources = []
|
||||
test_data = sample.Sample(
|
||||
name='testexceptionanother',
|
||||
type=default_test_data.type,
|
||||
unit=default_test_data.unit,
|
||||
volume=default_test_data.volume,
|
||||
user_id=default_test_data.user_id,
|
||||
project_id=default_test_data.project_id,
|
||||
resource_id=default_test_data.resource_id,
|
||||
timestamp=default_test_data.timestamp,
|
||||
resource_metadata=default_test_data.resource_metadata)
|
||||
test_data = default_test_data('testexceptionanother')
|
||||
|
||||
class Discovery(TestDiscovery):
|
||||
params = []
|
||||
|
|
|
|||
|
|
@ -23,7 +23,6 @@ from ceilometer.compute import discovery as nova_discover
|
|||
from ceilometer.hardware import discovery
|
||||
from ceilometer.polling import manager
|
||||
from ceilometer.polling import plugin_base
|
||||
from ceilometer import sample
|
||||
from ceilometer import service
|
||||
from ceilometer.tests.unit.polling import agentbase
|
||||
|
||||
|
|
@ -167,30 +166,12 @@ class TestRunTasks(agentbase.BaseAgentManagerTestCase):
|
|||
class PollsterKeystone(TestPollsterKeystone):
|
||||
samples = []
|
||||
resources = []
|
||||
test_data = sample.Sample(
|
||||
name='testkeystone',
|
||||
type=agentbase.default_test_data.type,
|
||||
unit=agentbase.default_test_data.unit,
|
||||
volume=agentbase.default_test_data.volume,
|
||||
user_id=agentbase.default_test_data.user_id,
|
||||
project_id=agentbase.default_test_data.project_id,
|
||||
resource_id=agentbase.default_test_data.resource_id,
|
||||
timestamp=agentbase.default_test_data.timestamp,
|
||||
resource_metadata=agentbase.default_test_data.resource_metadata)
|
||||
test_data = agentbase.default_test_data('testkeystone')
|
||||
|
||||
class PollsterPollingException(TestPollsterPollingException):
|
||||
samples = []
|
||||
resources = []
|
||||
test_data = sample.Sample(
|
||||
name='testpollingexception',
|
||||
type=agentbase.default_test_data.type,
|
||||
unit=agentbase.default_test_data.unit,
|
||||
volume=agentbase.default_test_data.volume,
|
||||
user_id=agentbase.default_test_data.user_id,
|
||||
project_id=agentbase.default_test_data.project_id,
|
||||
resource_id=agentbase.default_test_data.resource_id,
|
||||
timestamp=agentbase.default_test_data.timestamp,
|
||||
resource_metadata=agentbase.default_test_data.resource_metadata)
|
||||
test_data = agentbase.default_test_data('testpollingexception')
|
||||
|
||||
def create_manager(self):
|
||||
return manager.AgentManager(0, self.CONF)
|
||||
|
|
|
|||
Loading…
Reference in New Issue