← Back to branch summary

~ubuntu-branches/ubuntu/wily/heat/wily

« back to all changes in this revision

Viewing changes to heat_integrationtests/common/remote_client.py

  • Committer: Package Import Robot
  • Author(s): Corey Bryant, Corey Bryant, James Page
  • Date: 2015-07-07 17:06:19 UTC
  • mfrom: (1.1.26) (45.1.1 vivid-proposed)
  • Revision ID: package-import@ubuntu.com-20150707170619-hra2dbjpfofpou4s
Tags: 1:5.0.0~b1-0ubuntu1
[ Corey Bryant ]
* New upstream milestone for OpenStack Liberty:
  - d/control: Align (build-)depends with upstream.
  - d/p/fix-requirements.patch: Rebased.
  - d/p/sudoers_patch.patch: Rebased.

[ James Page ]
* d/s/options: Ignore any removal of egg-info data during package clean.
* d/control: Drop MySQL and PostgreSQL related BD's, not required for unit
  testing.

Show diffs side-by-side

added added

removed removed

Lines of Context:
heat_integrationtests/common/remote_client.py
10
10
#    License for the specific language governing permissions and limitations
11
11
#    under the License.
12
12
 
13
 
import cStringIO
14
13
import re
15
14
import select
16
15
import socket
34
33
        self.password = password
35
34
        if isinstance(pkey, six.string_types):
36
35
            pkey = paramiko.RSAKey.from_private_key(
37
 
                cStringIO.StringIO(str(pkey)))
 
36
                six.moves.cStringIO(str(pkey)))
38
37
        self.pkey = pkey
39
38
        self.look_for_keys = look_for_keys
40
39
        self.key_filename = key_filename