summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorRichard Maw <richard.maw@gmail.com>2014-08-08 14:15:01 (GMT)
committerRichard Maw <richard.maw@codethink.co.uk>2014-08-19 15:49:02 (GMT)
commit823575a89085aedcb20b95d31005d19edb10e776 (patch)
tree90a4ff556128fcacfd8f20c332eca840da5af285 /scripts
parent75c580e7d25cf90631bf2ecca3457b4bf7d4fdb9 (diff)
downloaddefinitions-823575a89085aedcb20b95d31005d19edb10e776.tar.gz
Various style fixes to release-test
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/release-test11
1 files changed, 7 insertions, 4 deletions
diff --git a/scripts/release-test b/scripts/release-test
index ec171d5..1939a0d 100755
--- a/scripts/release-test
+++ b/scripts/release-test
@@ -36,6 +36,7 @@ import morphlib
class MorphologyHelper(object):
+
def __init__(self):
self.sb = sb = morphlib.sysbranchdir.open_from_within('.')
defs_repo_path = sb.get_git_directory_name(sb.root_repository_url)
@@ -79,6 +80,7 @@ class TimeoutError(cliapp.AppException):
class VMHost(object):
+
def __init__(self, user, address, disk_path):
self.user = user
self.address = address
@@ -96,6 +98,7 @@ class VMHost(object):
class Instance(object):
+
def __init__(self, deployment, config, host_machine, vm_id, rootfs_path):
self.deployment = deployment
self.config = config
@@ -119,11 +122,11 @@ class Instance(object):
return cliapp.runcmd(ssh_cmd, **kwargs)
def _wait_for_dhcp(self, timeout):
- '''
- Block until given hostname resolves successfully.
+ '''Block until given hostname resolves successfully.
Raises TimeoutError if the hostname has not appeared in 'timeout'
seconds.
+
'''
start_time = time.time()
while True:
@@ -177,8 +180,8 @@ class Instance(object):
class Deployment(object):
- def __init__(self, cluster_path, name,
- deployment_config, host_machine):
+
+ def __init__(self, cluster_path, name, deployment_config, host_machine):
self.cluster_path = cluster_path
self.name = name
self.deployment_config = deployment_config