Ubuntu CI Engine

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

  1. 1318774
  2. Merge into trunk
Proposed by Chris Johnston
Status: Merged
Approved by: Chris Johnston
Approved revision: 478
Merged at revision: 481
Proposed branch: lp:~cjohnston/uci-engine/1318774
Merge into: lp:uci-engine
Diff against target: 23 lines (+4/-2)
1 file modified
tests/test_juju_gui.py (+4/-2)
To merge this branch: bzr merge lp:~cjohnston/uci-engine/1318774
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Andy Doan (community) Approve
Review via email: mp+219247@code.launchpad.net

Commit message

Fix broken Juju gui integration test

To post a comment you must log in.
Revision history for this message
Andy Doan (doanac) :
review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

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)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'tests/test_juju_gui.py'
2--- tests/test_juju_gui.py 2014-04-16 18:36:03 +0000
3+++ tests/test_juju_gui.py 2014-05-12 18:54:31 +0000
4@@ -17,7 +17,7 @@
5 import unittest
6 import urllib2
7
8-
9+import amulet
10 import deployers
11
12
13@@ -27,7 +27,9 @@
14 deployer_cfg = 'juju-gui.yaml'
15
16 def get_unit(self):
17- unit = self.status['services']['ci-juju-gui']['units'].values()[0]
18+ status = amulet.waiter.status(
19+ self.deployer.deployment.juju_env)
20+ unit = status['services']['ci-juju-gui']['units'].values()[0]
21 return unit
22
23 def test_juju_gui(self):

Subscribers

People subscribed via source and target branches