From fe3a8e9228bedc13f528e06bd31c721dfcddf919 Mon Sep 17 00:00:00 2001 From: Alexey Weyl Date: Wed, 7 Dec 2016 13:36:53 +0000 Subject: [PATCH] heat tempest fix Change-Id: I4e839025386d1e76875d2d049e4ba9f41435593c --- .../tests/api/alarms/test_alarms.py | 1 + .../tests/api/datasources/test_aodh.py | 2 ++ .../api/datasources/test_cinder_volume.py | 1 + .../tests/api/datasources/test_heat_stack.py | 3 +-- .../tests/api/datasources/test_neutron.py | 1 + .../tests/api/datasources/test_nova.py | 1 + .../api/datasources/test_static_physical.py | 1 + .../tests/api/rca/test_rca.py | 21 ++++++++++++------- .../tests/api/topology/test_topology.py | 11 ++++++++++ 9 files changed, 32 insertions(+), 10 deletions(-) diff --git a/vitrage_tempest_tests/tests/api/alarms/test_alarms.py b/vitrage_tempest_tests/tests/api/alarms/test_alarms.py index a9f7470fb..933118956 100644 --- a/vitrage_tempest_tests/tests/api/alarms/test_alarms.py +++ b/vitrage_tempest_tests/tests/api/alarms/test_alarms.py @@ -48,6 +48,7 @@ class TestAlarms(BaseAlarmsTest): utils.uni2str(instances[0].id)) except Exception as e: LOG.exception(e) + raise e finally: self._delete_ceilometer_alarms() self._delete_instances() diff --git a/vitrage_tempest_tests/tests/api/datasources/test_aodh.py b/vitrage_tempest_tests/tests/api/datasources/test_aodh.py index 835489bae..26e02fe10 100644 --- a/vitrage_tempest_tests/tests/api/datasources/test_aodh.py +++ b/vitrage_tempest_tests/tests/api/datasources/test_aodh.py @@ -56,6 +56,7 @@ class TestAodhAlarm(BaseAlarmsTest): entities) except Exception as e: LOG.exception(e) + raise e finally: self._delete_ceilometer_alarms() self._delete_instances() @@ -84,6 +85,7 @@ class TestAodhAlarm(BaseAlarmsTest): entities) except Exception as e: LOG.exception(e) + raise e finally: self._delete_ceilometer_alarms() diff --git a/vitrage_tempest_tests/tests/api/datasources/test_cinder_volume.py b/vitrage_tempest_tests/tests/api/datasources/test_cinder_volume.py index 1b5a821d0..f583d791a 100644 --- a/vitrage_tempest_tests/tests/api/datasources/test_cinder_volume.py +++ b/vitrage_tempest_tests/tests/api/datasources/test_cinder_volume.py @@ -55,5 +55,6 @@ class TestCinderVolume(BaseTopologyTest): entities) except Exception as e: LOG.exception(e) + raise e finally: self._rollback_to_default() diff --git a/vitrage_tempest_tests/tests/api/datasources/test_heat_stack.py b/vitrage_tempest_tests/tests/api/datasources/test_heat_stack.py index 52fe3dfa3..e9ea6777d 100644 --- a/vitrage_tempest_tests/tests/api/datasources/test_heat_stack.py +++ b/vitrage_tempest_tests/tests/api/datasources/test_heat_stack.py @@ -13,7 +13,6 @@ # under the License. import time -import unittest from oslo_log import log as logging @@ -29,7 +28,6 @@ class TestHeatStack(BaseTopologyTest): def setUpClass(cls): super(TestHeatStack, cls).setUpClass() - @unittest.skip("skip temporary") def test_heat_stack(self): """heat stack test @@ -66,6 +64,7 @@ class TestHeatStack(BaseTopologyTest): entities) except Exception as e: LOG.exception(e) + raise e finally: self._delete_stacks() diff --git a/vitrage_tempest_tests/tests/api/datasources/test_neutron.py b/vitrage_tempest_tests/tests/api/datasources/test_neutron.py index 40bb22c61..76ce8d34e 100644 --- a/vitrage_tempest_tests/tests/api/datasources/test_neutron.py +++ b/vitrage_tempest_tests/tests/api/datasources/test_neutron.py @@ -63,6 +63,7 @@ class TestNeutron(BaseTopologyTest): entities) except Exception as e: LOG.exception(e) + raise e finally: self._delete_instances() diff --git a/vitrage_tempest_tests/tests/api/datasources/test_nova.py b/vitrage_tempest_tests/tests/api/datasources/test_nova.py index 19d261f50..c998c4a97 100644 --- a/vitrage_tempest_tests/tests/api/datasources/test_nova.py +++ b/vitrage_tempest_tests/tests/api/datasources/test_nova.py @@ -51,5 +51,6 @@ class TestNova(BaseTopologyTest): entities) except Exception as e: LOG.exception(e) + raise e finally: self._rollback_to_default() diff --git a/vitrage_tempest_tests/tests/api/datasources/test_static_physical.py b/vitrage_tempest_tests/tests/api/datasources/test_static_physical.py index 4b7deb178..95eaaba44 100644 --- a/vitrage_tempest_tests/tests/api/datasources/test_static_physical.py +++ b/vitrage_tempest_tests/tests/api/datasources/test_static_physical.py @@ -55,6 +55,7 @@ class TestStaticPhysical(BaseApiTest): entities) except Exception as e: LOG.exception(e) + raise e finally: self._delete_switches() diff --git a/vitrage_tempest_tests/tests/api/rca/test_rca.py b/vitrage_tempest_tests/tests/api/rca/test_rca.py index ceefd1fd2..f5bc2bed8 100644 --- a/vitrage_tempest_tests/tests/api/rca/test_rca.py +++ b/vitrage_tempest_tests/tests/api/rca/test_rca.py @@ -52,6 +52,7 @@ class TestRca(BaseRcaTest): self._compare_rca(api_rca, cli_rca) except Exception as e: LOG.exception(e) + raise e finally: self._clean_all() @@ -77,8 +78,9 @@ class TestRca(BaseRcaTest): self._validate_rca(rca=api_rca['nodes']) self._validate_relationship(links=api_rca['links'], alarms=api_rca['nodes']) - except Exception: - LOG.error('Got exception', False) + except Exception as e: + LOG.exception(e) + raise e finally: self._clean_all() @@ -98,8 +100,9 @@ class TestRca(BaseRcaTest): self._validate_deduce_alarms(alarms=api_alarms, instances=instances) - except Exception: - LOG.error('Got exception', False) + except Exception as e: + LOG.exception(e) + raise e finally: self._clean_all() @@ -120,8 +123,9 @@ class TestRca(BaseRcaTest): self._validate_set_state(topology=topology['nodes'], instances=instances) - except Exception: - LOG.error('Got exception', False) + except Exception as e: + LOG.exception(e) + raise e finally: self._clean_all() @@ -143,7 +147,8 @@ class TestRca(BaseRcaTest): self._validate_notifier(alarms=ceilometer_alarms, vitrage_alarms=vitrage_alarms) - except Exception: - LOG.error('Got exception', False) + except Exception as e: + LOG.exception(e) + raise e finally: self._clean_all() diff --git a/vitrage_tempest_tests/tests/api/topology/test_topology.py b/vitrage_tempest_tests/tests/api/topology/test_topology.py index decd0897a..382b03c73 100644 --- a/vitrage_tempest_tests/tests/api/topology/test_topology.py +++ b/vitrage_tempest_tests/tests/api/topology/test_topology.py @@ -85,6 +85,7 @@ class TestTopology(BaseTopologyTest): entities) except Exception as e: LOG.exception(e) + raise e finally: self._rollback_to_default() @@ -119,6 +120,7 @@ class TestTopology(BaseTopologyTest): entities) except Exception as e: LOG.exception(e) + raise e finally: self._rollback_to_default() @@ -151,6 +153,7 @@ class TestTopology(BaseTopologyTest): entities) except Exception as e: LOG.exception(e) + raise e finally: self._rollback_to_default() @@ -178,6 +181,7 @@ class TestTopology(BaseTopologyTest): entities) except Exception as e: LOG.exception(e) + raise e finally: self._rollback_to_default() @@ -205,6 +209,7 @@ class TestTopology(BaseTopologyTest): entities) except Exception as e: LOG.exception(e) + raise e finally: self._rollback_to_default() @@ -237,6 +242,7 @@ class TestTopology(BaseTopologyTest): entities) except Exception as e: LOG.exception(e) + raise e finally: self._rollback_to_default() @@ -265,6 +271,7 @@ class TestTopology(BaseTopologyTest): entities) except Exception as e: LOG.exception(e) + raise e finally: self._rollback_to_default() @@ -298,6 +305,7 @@ class TestTopology(BaseTopologyTest): entities) except Exception as e: LOG.exception(e) + raise e finally: self._rollback_to_default() @@ -321,6 +329,7 @@ class TestTopology(BaseTopologyTest): self.assertEqual( e.message, "Graph-type 'graph' requires a 'root' with 'depth'") + raise e finally: self._rollback_to_default() @@ -348,6 +357,7 @@ class TestTopology(BaseTopologyTest): len(api_graph['links']), 'num of edges') except Exception as e: LOG.exception(e) + raise e finally: self._rollback_to_default() @@ -371,5 +381,6 @@ class TestTopology(BaseTopologyTest): self.assertEqual({}, api_graph) except Exception as e: LOG.exception(e) + raise e finally: self._rollback_to_default()