openstack/vitrage-tempest-plugin
Code Issues Proposed changes

sync tempest tests

Browse Source 
Change-Id: I852c863218864d5f45b388dd227b11dc9858834c
This commit is contained in:
Eyal 2018-01-08 08:41:57 +02:00
parent a5614577ce
commit f057c9846e
3 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
vitrage_tempest_tests/tests/api/templates/base.py
View File

@ -26,7 +26,7 @@ class BaseTemplateTest(BaseVitrageTempest):
"""Template test class for Vitrage API tests.""" """Template test class for Vitrage API tests."""
DEFAULT_PATH = '/etc/vitrage/templates/' DEFAULT_PATH = '/etc/vitrage/templates/'
TEST_PATH = '/opt/stack/vitrage/vitrage_tempest_tests/' \ TEST_PATH = '/opt/stack/vitrage-tempest-plugin/vitrage_tempest_tests/' \
+ 'tests/resources/templates/api/' + 'tests/resources/templates/api/'
NON_EXIST_FILE = 'non_exist_file.yaml' NON_EXIST_FILE = 'non_exist_file.yaml'

8
vitrage_tempest_tests/tests/e2e/test_actions_base.py
View File

@ -69,8 +69,6 @@ class TestActionsBase(BaseVitrageTempest):
g_utils.first_match(rca['nodes'], **expected_alarm), g_utils.first_match(rca['nodes'], **expected_alarm),
'expected_alarm is not in the rca %s' % str(expected_alarm)) 'expected_alarm is not in the rca %s' % str(expected_alarm))
rca_inspected = rca['nodes'][rca['inspected_index']] rca_inspected = rca['nodes'][rca['inspected_index']]
self.assertEqual( self.assertTrue(g_utils.is_subset(inspected, rca_inspected),
True, 'Invalid inspected item \n%s\n%s' %
g_utils.is_subset(inspected, rca_inspected), (str(rca_inspected), str(inspected)))
'Invalid inspected item \n%s\n%s' %
(str(rca_inspected), str(inspected)))

2
vitrage_tempest_tests/tests/e2e/test_basic_actions.py
View File

@ -176,7 +176,7 @@ class TestBasicActions(TestActionsBase):
alarms = TempestClients.vitrage().alarm.list( alarms = TempestClients.vitrage().alarm.list(
vitrage_id=self.orig_host.get(VProps.VITRAGE_ID), vitrage_id=self.orig_host.get(VProps.VITRAGE_ID),
all_tenants=True) all_tenants=True)
self.assertEqual(True, len(alarms) >= 2, 'alarms %s' % str(alarms)) self.assertTrue(len(alarms) >= 2, 'alarms %s' % str(alarms))
deduced = g_utils.first_match(alarms, **DEDUCED_PROPS) deduced = g_utils.first_match(alarms, **DEDUCED_PROPS)
trigger = g_utils.first_match(alarms, **TRIGGER_ALARM_2_PROPS) trigger = g_utils.first_match(alarms, **TRIGGER_ALARM_2_PROPS)