heat tempest fix

Change-Id: I4e839025386d1e76875d2d049e4ba9f41435593c
This commit is contained in:
Alexey Weyl 2016-12-07 13:36:53 +00:00
parent fa1a5df467
commit f9325fa951
9 changed files with 32 additions and 10 deletions

@ -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()

@ -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()

@ -55,5 +55,6 @@ class TestCinderVolume(BaseTopologyTest):
entities)
except Exception as e:
LOG.exception(e)
raise e
finally:
self._rollback_to_default()

@ -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()

@ -63,6 +63,7 @@ class TestNeutron(BaseTopologyTest):
entities)
except Exception as e:
LOG.exception(e)
raise e
finally:
self._delete_instances()

@ -51,5 +51,6 @@ class TestNova(BaseTopologyTest):
entities)
except Exception as e:
LOG.exception(e)
raise e
finally:
self._rollback_to_default()

@ -55,6 +55,7 @@ class TestStaticPhysical(BaseApiTest):
entities)
except Exception as e:
LOG.exception(e)
raise e
finally:
self._delete_switches()

@ -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()

@ -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()