Merge "Add smoke, components, features and performance test suite for Yatdstick"

[yardstick.git] / yardstick / benchmark / scenarios / networking / ping.py

diff --git a/yardstick/benchmark/scenarios/networking/ping.py b/yardstick/benchmark/scenarios/networking/ping.py
index 2becdaf..6e49a14 100644 (file)
--- a/yardstick/benchmark/scenarios/networking/ping.py
+++ b/yardstick/benchmark/scenarios/networking/ping.py
@@ -55,7 +55,7 @@ class Ping(base.Scenario):
             self.connection = ssh.SSH(user, ip, key_filename=key_filename,
                                       port=ssh_port)
 
-        self.connection.wait()
+        self.connection.wait(timeout=600)
 
     def run(self, result):
         """execute the benchmark"""
@@ -79,9 +79,10 @@ class Ping(base.Scenario):
                 target_vm = self.scenario_cfg['target']
 
             LOG.debug("ping '%s' '%s'", options, dest)
-            exit_status, stdout, stderr = self.connection.execute(
-                "/bin/sh -s {0} {1}".format(dest, options),
-                stdin=open(self.target_script, "r"))
+            with open(self.target_script, "r") as stdin_file:
+                exit_status, stdout, stderr = self.connection.execute(
+                    "/bin/sh -s {0} {1}".format(dest, options),
+                    stdin=stdin_file)
 
             if exit_status != 0:
                 raise RuntimeError(stderr)