aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwu.zhihui <wu.zhihui1@zte.com.cn>2015-11-02 16:11:54 +0800
committerwu.zhihui <wu.zhihui1@zte.com.cn>2015-11-02 17:25:53 +0800
commit377fa4dfa142b0bc7e8be92e442199456993fe9d (patch)
tree790939e1131bdc1e26a49457af80b66cc1c9898f
parent05d5ac8d6d5e9bd1e6b69afbd764000aeb4a030e (diff)
Avoid the ValueError exception for a ping timeout.
In ping.py: If ping a ip address timeout, the return value "stdout" is null. And the code "rtt=float(stdout)" raises a ValueError exception. The better handle is to avoid the exception and log a ping timeout. Change-Id: Ia2a3ff44c35dda1a700a5109f8e642a636e89bc6 Signed-off-by: wu.zhihui <wu.zhihui1@zte.com.cn>
-rw-r--r--yardstick/benchmark/scenarios/networking/ping.py13
1 files changed, 8 insertions, 5 deletions
diff --git a/yardstick/benchmark/scenarios/networking/ping.py b/yardstick/benchmark/scenarios/networking/ping.py
index 34278b90f..c62c79e54 100644
--- a/yardstick/benchmark/scenarios/networking/ping.py
+++ b/yardstick/benchmark/scenarios/networking/ping.py
@@ -67,12 +67,15 @@ class Ping(base.Scenario):
if exit_status != 0:
raise RuntimeError(stderr)
- result["rtt"] = float(stdout)
+ if stdout:
+ result["rtt"] = float(stdout)
- if "sla" in self.scenario_cfg:
- sla_max_rtt = int(self.scenario_cfg["sla"]["max_rtt"])
- assert result["rtt"] <= sla_max_rtt, "rtt %f > sla:max_rtt(%f); " % \
- (result["rtt"], sla_max_rtt)
+ if "sla" in self.scenario_cfg:
+ sla_max_rtt = int(self.scenario_cfg["sla"]["max_rtt"])
+ assert result["rtt"] <= sla_max_rtt, "rtt %f > sla:max_rtt(%f); " % \
+ (result["rtt"], sla_max_rtt)
+ else:
+ LOG.error("ping '%s' '%s' timeout", options, destination)
def _test():