openstack/vitrage-tempest-plugin
Code Issues Proposed changes

Merge "Fixed order of arguments in assertEqual"

Browse Source
This commit is contained in:
Jenkins 2017-07-19 12:22:16 +00:00 committed by Gerrit Code Review
commit 3cd5521d66
4 changed files with 30 additions and 30 deletions
vitrage_tempest_tests/tests/api
rca
base.py
templates
base.pytest_template.py
topology
test_topology.py

24
vitrage_tempest_tests/tests/api/rca/base.py

@ -83,9 +83,9 @@ class BaseRcaTest(BaseAlarmsTest):
[VITRAGE_DATASOURCE, VITRAGE_ALARM_NAME,
OperationalAlarmSeverity.WARNING])
self.assertEqual(len(rca), 3)
self.assertEqual(len(resource_alarm), 1)
self.assertEqual(len(deduce_alarms), 2)
self.assertEqual(3, len(rca))
self.assertEqual(1, len(resource_alarm))
self.assertEqual(2, len(deduce_alarms))
def _validate_deduce_alarms(self, alarms, instances):
"""Validate alarm existence """
@ -106,9 +106,9 @@ class BaseRcaTest(BaseAlarmsTest):
NOVA_INSTANCE_DATASOURCE,
utils.uni2str(instances[1].id)])
self.assertEqual(len(alarms), 3)
self.assertEqual(len(deduce_alarms_1), 1)
self.assertEqual(len(deduce_alarms_2), 1)
self.assertEqual(3, len(alarms))
self.assertEqual(1, len(deduce_alarms_1))
self.assertEqual(1, len(deduce_alarms_2))
def _validate_relationship(self, links, alarms):
self.assertNotEqual(len(links), 0, 'The links list is empty')
@ -126,7 +126,7 @@ class BaseRcaTest(BaseAlarmsTest):
or target_alarm_name != VITRAGE_ALARM_NAME:
flag = False
self.assertEqual(len(alarms), 3)
self.assertEqual(3, len(alarms))
self.assertTrue(flag)
def _validate_set_state(self, topology, instances):
@ -159,9 +159,9 @@ class BaseRcaTest(BaseAlarmsTest):
OperationalResourceState.SUBOPTIMAL,
OperationalResourceState.SUBOPTIMAL])
self.assertEqual(len(host), 1)
self.assertEqual(len(vm1), 1)
self.assertEqual(len(vm2), 1)
self.assertEqual(1, len(host))
self.assertEqual(1, len(vm1))
self.assertEqual(1, len(vm2))
def _validate_notifier(self, alarms, vitrage_alarms):
self.assertNotEqual(len(alarms), 0, 'The aodh alarms list is empty')
@ -182,8 +182,8 @@ class BaseRcaTest(BaseAlarmsTest):
validation += 1
break
self.assertEqual(len(vitrage_alarms), validation)
self.assertEqual(len(alarms), 3)
self.assertEqual(validation, len(vitrage_alarms))
self.assertEqual(3, len(alarms))
def _get_hostname(self):
return self._get_value(item=self._get_host(), key=VProps.ID)

24
vitrage_tempest_tests/tests/api/templates/base.py

@ -108,10 +108,10 @@ class BaseTemplateTest(BaseApiTest):
self, template, validation, path):
self.assertNotEqual(len(validation), 0,
'The template validation is empty')
self.assertEqual(validation['file path'], path)
self.assertEqual(validation['status code'], 0)
self.assertEqual(validation['status'], self.OK_STATUS)
self.assertEqual(validation['message'], self.OK_MSG)
self.assertEqual(path, validation['file path'])
self.assertEqual(0, validation['status code'])
self.assertEqual(self.OK_STATUS, validation['status'])
self.assertEqual(self.OK_MSG, validation['message'])
self.assertEqual(validation['message'], template['status details'])
def _run_template_validation(
@ -119,14 +119,14 @@ class BaseTemplateTest(BaseApiTest):
self.assertIn(path, validation['file path'])
if negative:
self.assertEqual(validation['status code'], 3)
self.assertEqual(validation['status'], self.ERROR_STATUS)
self.assertEqual(3, validation['status code'])
self.assertEqual(self.ERROR_STATUS, validation['status'])
self.assertNotEqual(validation['message'], self.OK_MSG)
return
self.assertEqual(validation['status code'], 0)
self.assertEqual(validation['status'], self.OK_STATUS)
self.assertEqual(validation['message'], self.OK_MSG)
self.assertEqual(0, validation['status code'])
self.assertEqual(self.OK_STATUS, validation['status'])
self.assertEqual(self.OK_MSG, validation['message'])
def _compare_template_show(self, api_templates, cli_templates):
self.assertNotEqual(len(api_templates), 0,
@ -157,8 +157,8 @@ class BaseTemplateTest(BaseApiTest):
self.assertIn(
template_show['metadata']['name'], template_content)
self.assertEqual(
len(template_show['definitions']['entities']), entities)
entities, len(template_show['definitions']['entities']))
self.assertEqual(
len(template_show['definitions']['relationships']), relationships)
relationships, len(template_show['definitions']['relationships']))
self.assertEqual(
len(template_show['scenarios']), scenarios)
scenarios, len(template_show['scenarios']))

8
vitrage_tempest_tests/tests/api/templates/test_template.py

@ -78,8 +78,8 @@ class TestValidate(BaseTemplateTest):
validation = self.vitrage_client.template.validate(path=path)
self.assertIsNone(validation)
except Exception as up:
self.assertEqual(up.strerror, 'No such file or directory')
self.assertEqual(up.errno, 2)
self.assertEqual('No such file or directory', up.strerror)
self.assertEqual(2, up.errno)
def test_templates_validate_corrupted_templates(self):
"""templates_validate test
@ -90,7 +90,7 @@ class TestValidate(BaseTemplateTest):
try:
path = self.TEST_PATH + self.ERROR_FILE
validation = self.vitrage_client.template.validate(path=path)
self.assertEqual(len(validation['results']), 1)
self.assertEqual(1, len(validation['results']))
self._run_template_validation(
validation['results'][0], path, negative=True)
except Exception:
@ -104,7 +104,7 @@ class TestValidate(BaseTemplateTest):
try:
path = self.TEST_PATH + self.OK_FILE
validation = self.vitrage_client.template.validate(path=path)
self.assertEqual(len(validation['results']), 1)
self.assertEqual(1, len(validation['results']))
self._run_template_validation(
validation['results'][0], path)
except Exception:

4
vitrage_tempest_tests/tests/api/topology/test_topology.py

@ -348,8 +348,8 @@ class TestTopology(BaseTopologyTest):
except ClientException as e:
self.assertEqual(403, e.code)
self.assertEqual(
str(e.message),
"Graph-type 'graph' requires a 'root' with 'depth'")
"Graph-type 'graph' requires a 'root' with 'depth'",
str(e.message))
finally:
self._rollback_to_default()