Tempsets exception raise change
Change-Id: I8f833d98f5db4548c8158378dd367a5602adfe82
This commit is contained in:
parent
ae6da02bf2
commit
9844aa077e
@ -48,7 +48,7 @@ class TestAlarms(BaseAlarmsTest):
|
|||||||
utils.uni2str(instances[0].id))
|
utils.uni2str(instances[0].id))
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
LOG.exception(e)
|
LOG.exception(e)
|
||||||
raise e
|
raise
|
||||||
finally:
|
finally:
|
||||||
self._delete_ceilometer_alarms()
|
self._delete_ceilometer_alarms()
|
||||||
self._delete_instances()
|
self._delete_instances()
|
||||||
|
@ -56,7 +56,7 @@ class TestAodhAlarm(BaseAlarmsTest):
|
|||||||
entities)
|
entities)
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
LOG.exception(e)
|
LOG.exception(e)
|
||||||
raise e
|
raise
|
||||||
finally:
|
finally:
|
||||||
self._delete_ceilometer_alarms()
|
self._delete_ceilometer_alarms()
|
||||||
self._delete_instances()
|
self._delete_instances()
|
||||||
@ -85,7 +85,7 @@ class TestAodhAlarm(BaseAlarmsTest):
|
|||||||
entities)
|
entities)
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
LOG.exception(e)
|
LOG.exception(e)
|
||||||
raise e
|
raise
|
||||||
finally:
|
finally:
|
||||||
self._delete_ceilometer_alarms()
|
self._delete_ceilometer_alarms()
|
||||||
|
|
||||||
|
@ -55,6 +55,6 @@ class TestCinderVolume(BaseTopologyTest):
|
|||||||
entities)
|
entities)
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
LOG.exception(e)
|
LOG.exception(e)
|
||||||
raise e
|
raise
|
||||||
finally:
|
finally:
|
||||||
self._rollback_to_default()
|
self._rollback_to_default()
|
||||||
|
@ -64,7 +64,7 @@ class TestHeatStack(BaseTopologyTest):
|
|||||||
entities)
|
entities)
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
LOG.exception(e)
|
LOG.exception(e)
|
||||||
raise e
|
raise
|
||||||
finally:
|
finally:
|
||||||
self._delete_stacks()
|
self._delete_stacks()
|
||||||
|
|
||||||
|
@ -63,7 +63,7 @@ class TestNeutron(BaseTopologyTest):
|
|||||||
entities)
|
entities)
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
LOG.exception(e)
|
LOG.exception(e)
|
||||||
raise e
|
raise
|
||||||
finally:
|
finally:
|
||||||
self._delete_instances()
|
self._delete_instances()
|
||||||
|
|
||||||
|
@ -51,6 +51,6 @@ class TestNova(BaseTopologyTest):
|
|||||||
entities)
|
entities)
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
LOG.exception(e)
|
LOG.exception(e)
|
||||||
raise e
|
raise
|
||||||
finally:
|
finally:
|
||||||
self._rollback_to_default()
|
self._rollback_to_default()
|
||||||
|
@ -55,7 +55,7 @@ class TestStaticPhysical(BaseApiTest):
|
|||||||
entities)
|
entities)
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
LOG.exception(e)
|
LOG.exception(e)
|
||||||
raise e
|
raise
|
||||||
finally:
|
finally:
|
||||||
self._delete_switches()
|
self._delete_switches()
|
||||||
|
|
||||||
|
@ -52,7 +52,7 @@ class TestRca(BaseRcaTest):
|
|||||||
self._compare_rca(api_rca, cli_rca)
|
self._compare_rca(api_rca, cli_rca)
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
LOG.exception(e)
|
LOG.exception(e)
|
||||||
raise e
|
raise
|
||||||
finally:
|
finally:
|
||||||
self._clean_all()
|
self._clean_all()
|
||||||
|
|
||||||
@ -80,7 +80,7 @@ class TestRca(BaseRcaTest):
|
|||||||
alarms=api_rca['nodes'])
|
alarms=api_rca['nodes'])
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
LOG.exception(e)
|
LOG.exception(e)
|
||||||
raise e
|
raise
|
||||||
finally:
|
finally:
|
||||||
self._clean_all()
|
self._clean_all()
|
||||||
|
|
||||||
@ -102,7 +102,7 @@ class TestRca(BaseRcaTest):
|
|||||||
instances=instances)
|
instances=instances)
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
LOG.exception(e)
|
LOG.exception(e)
|
||||||
raise e
|
raise
|
||||||
finally:
|
finally:
|
||||||
self._clean_all()
|
self._clean_all()
|
||||||
|
|
||||||
@ -125,7 +125,7 @@ class TestRca(BaseRcaTest):
|
|||||||
instances=instances)
|
instances=instances)
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
LOG.exception(e)
|
LOG.exception(e)
|
||||||
raise e
|
raise
|
||||||
finally:
|
finally:
|
||||||
self._clean_all()
|
self._clean_all()
|
||||||
|
|
||||||
@ -149,6 +149,6 @@ class TestRca(BaseRcaTest):
|
|||||||
vitrage_alarms=vitrage_alarms)
|
vitrage_alarms=vitrage_alarms)
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
LOG.exception(e)
|
LOG.exception(e)
|
||||||
raise e
|
raise
|
||||||
finally:
|
finally:
|
||||||
self._clean_all()
|
self._clean_all()
|
||||||
|
@ -85,7 +85,7 @@ class TestTopology(BaseTopologyTest):
|
|||||||
entities)
|
entities)
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
LOG.exception(e)
|
LOG.exception(e)
|
||||||
raise e
|
raise
|
||||||
finally:
|
finally:
|
||||||
self._rollback_to_default()
|
self._rollback_to_default()
|
||||||
|
|
||||||
@ -120,7 +120,7 @@ class TestTopology(BaseTopologyTest):
|
|||||||
entities)
|
entities)
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
LOG.exception(e)
|
LOG.exception(e)
|
||||||
raise e
|
raise
|
||||||
finally:
|
finally:
|
||||||
self._rollback_to_default()
|
self._rollback_to_default()
|
||||||
|
|
||||||
@ -153,7 +153,7 @@ class TestTopology(BaseTopologyTest):
|
|||||||
entities)
|
entities)
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
LOG.exception(e)
|
LOG.exception(e)
|
||||||
raise e
|
raise
|
||||||
finally:
|
finally:
|
||||||
self._rollback_to_default()
|
self._rollback_to_default()
|
||||||
|
|
||||||
@ -181,7 +181,7 @@ class TestTopology(BaseTopologyTest):
|
|||||||
entities)
|
entities)
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
LOG.exception(e)
|
LOG.exception(e)
|
||||||
raise e
|
raise
|
||||||
finally:
|
finally:
|
||||||
self._rollback_to_default()
|
self._rollback_to_default()
|
||||||
|
|
||||||
@ -209,7 +209,7 @@ class TestTopology(BaseTopologyTest):
|
|||||||
entities)
|
entities)
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
LOG.exception(e)
|
LOG.exception(e)
|
||||||
raise e
|
raise
|
||||||
finally:
|
finally:
|
||||||
self._rollback_to_default()
|
self._rollback_to_default()
|
||||||
|
|
||||||
@ -242,7 +242,7 @@ class TestTopology(BaseTopologyTest):
|
|||||||
entities)
|
entities)
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
LOG.exception(e)
|
LOG.exception(e)
|
||||||
raise e
|
raise
|
||||||
finally:
|
finally:
|
||||||
self._rollback_to_default()
|
self._rollback_to_default()
|
||||||
|
|
||||||
@ -271,7 +271,7 @@ class TestTopology(BaseTopologyTest):
|
|||||||
entities)
|
entities)
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
LOG.exception(e)
|
LOG.exception(e)
|
||||||
raise e
|
raise
|
||||||
finally:
|
finally:
|
||||||
self._rollback_to_default()
|
self._rollback_to_default()
|
||||||
|
|
||||||
@ -305,7 +305,7 @@ class TestTopology(BaseTopologyTest):
|
|||||||
entities)
|
entities)
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
LOG.exception(e)
|
LOG.exception(e)
|
||||||
raise e
|
raise
|
||||||
finally:
|
finally:
|
||||||
self._rollback_to_default()
|
self._rollback_to_default()
|
||||||
|
|
||||||
@ -329,7 +329,7 @@ class TestTopology(BaseTopologyTest):
|
|||||||
self.assertEqual(
|
self.assertEqual(
|
||||||
e.message,
|
e.message,
|
||||||
"Graph-type 'graph' requires a 'root' with 'depth'")
|
"Graph-type 'graph' requires a 'root' with 'depth'")
|
||||||
raise e
|
raise
|
||||||
finally:
|
finally:
|
||||||
self._rollback_to_default()
|
self._rollback_to_default()
|
||||||
|
|
||||||
@ -357,7 +357,7 @@ class TestTopology(BaseTopologyTest):
|
|||||||
len(api_graph['links']), 'num of edges')
|
len(api_graph['links']), 'num of edges')
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
LOG.exception(e)
|
LOG.exception(e)
|
||||||
raise e
|
raise
|
||||||
finally:
|
finally:
|
||||||
self._rollback_to_default()
|
self._rollback_to_default()
|
||||||
|
|
||||||
@ -381,6 +381,6 @@ class TestTopology(BaseTopologyTest):
|
|||||||
self.assertEqual({}, api_graph)
|
self.assertEqual({}, api_graph)
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
LOG.exception(e)
|
LOG.exception(e)
|
||||||
raise e
|
raise
|
||||||
finally:
|
finally:
|
||||||
self._rollback_to_default()
|
self._rollback_to_default()
|
||||||
|
Loading…
x
Reference in New Issue
Block a user