Skip to content

Commit

Permalink
cosmetic changes for ec2
Browse files Browse the repository at this point in the history
  • Loading branch information
Mikhail Sobolev committed Mar 24, 2015
1 parent 02a12e3 commit f736356
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion master/buildbot/buildslave/ec2.py
Expand Up @@ -338,7 +338,7 @@ def _stop_instance(self, instance, fast):
goal = (SHUTTINGDOWN, TERMINATED)
instance.update()
else:
goal = (TERMINATED,)
goal = TERMINATED,
while instance.state not in goal:
time.sleep(interval)
duration += interval
Expand Down Expand Up @@ -432,6 +432,7 @@ def _wait_for_instance(self, image):
(self.__class__.__name__, self.slavename, duration // 60,
self.instance.id))
self.instance.update()

if self.instance.state == RUNNING:
self.output = self.instance.get_console_output()
minutes = duration // 60
Expand Down

0 comments on commit f736356

Please sign in to comment.