From: Rex Lee <limingjiang@huawei.com>
Date: Mon, 5 Dec 2016 06:37:08 +0000 (+0000)
Subject: Merge "import new _put_file_shell method from upstream rally"
X-Git-Tag: danube.1.0~183
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=cee61dec722722c76d71d32fe56ad877c08e1d36;p=yardstick.git

Merge "import new _put_file_shell method from upstream rally"
---

cee61dec722722c76d71d32fe56ad877c08e1d36
diff --cc tests/unit/test_ssh.py
index 1e021a051,083ab039c..88638a0a8
--- a/tests/unit/test_ssh.py
+++ b/tests/unit/test_ssh.py
@@@ -17,9 -17,8 +17,10 @@@
  # rally/tests/unit/common/test_sshutils.py
  
  import os
+ import socket
  import unittest
 +from cStringIO import StringIO
 +
  import mock
  
  from yardstick import ssh