diff options
| author |   Kubi <jean.gaoliang@huawei.com> | 2017-08-26 03:46:39 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-08-26 03:46:39 +0000 |
| commit | 4db701fdc4da663b0b61d9930777a2201b315f8f (patch) | |
| tree | 12965aa2839b8b7c3434a62dcaf72bc6f3f503da /yardstick/benchmark/scenarios | |
| parent | 718610b927218906583b474019b3834def8637de (diff) | |
| parent | 90c92384f06f2c85e76155efc3efed41db6edfa7 (diff) | |
Merge "Raise Exception if HA test case failed"
Diffstat (limited to 'yardstick/benchmark/scenarios')
| -rw-r--r-- | yardstick/benchmark/scenarios/availability/scenario_general.py | 5 | ||||
| -rwxr-xr-x | yardstick/benchmark/scenarios/availability/serviceha.py | 5 |
2 files changed, 10 insertions, 0 deletions
diff --git a/yardstick/benchmark/scenarios/availability/scenario_general.py b/yardstick/benchmark/scenarios/availability/scenario_general.py index 17ad79f29..c7ed1d6ec 100644 --- a/yardstick/benchmark/scenarios/availability/scenario_general.py +++ b/yardstick/benchmark/scenarios/availability/scenario_general.py @@ -26,6 +26,7 @@ class ScenarioGeneral(base.Scenario): self.scenario_cfg = scenario_cfg self.context_cfg = context_cfg self.intermediate_variables = {} + self.pass_flag = True def setup(self): self.director = Director(self.scenario_cfg, self.context_cfg) @@ -63,6 +64,7 @@ class ScenarioGeneral(base.Scenario): if v == 0: result['sla_pass'] = 0 verify_result = False + self.pass_flag = False LOG.info( "\033[92m The service process not found in the host \ envrioment, the HA test case NOT pass") @@ -74,9 +76,12 @@ envrioment, the HA test case NOT pass") "the HA test case PASS! \033[0m") else: result['sla_pass'] = 0 + self.pass_flag = False LOG.info( "\033[91m Aoh, the HA test case FAIL," "please check the detail debug information! \033[0m") def teardown(self): self.director.knockoff() + + assert self.pass_flag, "The HA test case NOT passed" diff --git a/yardstick/benchmark/scenarios/availability/serviceha.py b/yardstick/benchmark/scenarios/availability/serviceha.py index 2f0012ecf..d0f5e9e4d 100755 --- a/yardstick/benchmark/scenarios/availability/serviceha.py +++ b/yardstick/benchmark/scenarios/availability/serviceha.py @@ -29,6 +29,7 @@ class ServiceHA(base.Scenario): self.context_cfg = context_cfg self.setup_done = False self.data = {} + self.pass_flag = True def setup(self): """scenario setup""" @@ -73,6 +74,7 @@ class ServiceHA(base.Scenario): for k, v in self.data.items(): if v == 0: result['sla_pass'] = 0 + self.pass_flag = False LOG.info("The service process not found in the host envrioment, \ the HA test case NOT pass") return @@ -81,6 +83,7 @@ the HA test case NOT pass") LOG.info("The HA test case PASS the SLA") else: result['sla_pass'] = 0 + self.pass_flag = False assert sla_pass is True, "The HA test case NOT pass the SLA" return @@ -90,6 +93,8 @@ the HA test case NOT pass") for attacker in self.attackers: attacker.recover() + assert self.pass_flag, "The HA test case NOT passed" + def _test(): # pragma: no cover """internal test function""" |