diff --git a/vitrage_tempest_tests/tests/api/templates/base.py b/vitrage_tempest_tests/tests/api/templates/base.py index 96b3489..2c6157b 100644 --- a/vitrage_tempest_tests/tests/api/templates/base.py +++ b/vitrage_tempest_tests/tests/api/templates/base.py @@ -26,7 +26,7 @@ class BaseTemplateTest(BaseVitrageTempest): """Template test class for Vitrage API tests.""" 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/' NON_EXIST_FILE = 'non_exist_file.yaml' diff --git a/vitrage_tempest_tests/tests/e2e/test_actions_base.py b/vitrage_tempest_tests/tests/e2e/test_actions_base.py index 4159663..9e675fb 100644 --- a/vitrage_tempest_tests/tests/e2e/test_actions_base.py +++ b/vitrage_tempest_tests/tests/e2e/test_actions_base.py @@ -69,8 +69,6 @@ class TestActionsBase(BaseVitrageTempest): g_utils.first_match(rca['nodes'], **expected_alarm), 'expected_alarm is not in the rca %s' % str(expected_alarm)) rca_inspected = rca['nodes'][rca['inspected_index']] - self.assertEqual( - True, - g_utils.is_subset(inspected, rca_inspected), - 'Invalid inspected item \n%s\n%s' % - (str(rca_inspected), str(inspected))) + self.assertTrue(g_utils.is_subset(inspected, rca_inspected), + 'Invalid inspected item \n%s\n%s' % + (str(rca_inspected), str(inspected))) diff --git a/vitrage_tempest_tests/tests/e2e/test_basic_actions.py b/vitrage_tempest_tests/tests/e2e/test_basic_actions.py index db6f4f5..574e7ae 100644 --- a/vitrage_tempest_tests/tests/e2e/test_basic_actions.py +++ b/vitrage_tempest_tests/tests/e2e/test_basic_actions.py @@ -176,7 +176,7 @@ class TestBasicActions(TestActionsBase): alarms = TempestClients.vitrage().alarm.list( vitrage_id=self.orig_host.get(VProps.VITRAGE_ID), 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) trigger = g_utils.first_match(alarms, **TRIGGER_ALARM_2_PROPS)