Merge lp:~cjohnston/uci-engine/1318774 into lp:uci-engine

[Chris Johnston]

Fix broken Juju gui integration test

[Andy Doan (doanac)]

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:478
http://s-jenkins.ubuntu-ci:8080/job/uci-engine-ci/621/
Executed test runs:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/uci-engine-ci/621/rebuild

review: Approve (continuous-integration)

=== modified file 'tests/test_juju_gui.py'
--- tests/test_juju_gui.py	2014-04-16 18:36:03 +0000
+++ tests/test_juju_gui.py	2014-05-12 18:54:31 +0000
@@ -17,7 +17,7 @@
 import unittest
 import urllib2
 
-
+import amulet
 import deployers
 
 
@@ -27,7 +27,9 @@
     deployer_cfg = 'juju-gui.yaml'
 
     def get_unit(self):
-        unit = self.status['services']['ci-juju-gui']['units'].values()[0]
+        status = amulet.waiter.status(
+            self.deployer.deployment.juju_env)
+        unit = status['services']['ci-juju-gui']['units'].values()[0]
         return unit
 
     def test_juju_gui(self):