Merge lp://qastaging/~doanac/uci-engine/webui-multiple into lp://qastaging/uci-engine

Proposed by Andy Doan
Status: Merged
Approved by: Andy Doan
Approved revision: 603
Merged at revision: 622
Proposed branch: lp://qastaging/~doanac/uci-engine/webui-multiple
Merge into: lp://qastaging/uci-engine
Prerequisite: lp://qastaging/~doanac/uci-engine/lander-logs-multi
Diff against target: 310 lines (+174/-38)
5 files modified
charms/precise/webui/Makefile (+3/-0)
charms/precise/webui/hooks/hooks.py (+51/-37)
charms/precise/webui/unit_tests/__init__.py (+14/-0)
charms/precise/webui/unit_tests/test_hooks.py (+102/-0)
testing/run_tests.py (+4/-1)
To merge this branch: bzr merge lp://qastaging/~doanac/uci-engine/webui-multiple
Reviewer Review Type Date Requested Status
Celso Providelo (community) Approve
PS Jenkins bot (community) continuous-integration Approve
Review via email: mp+223638@code.qastaging.launchpad.net

Commit message

webui charm: fix relationship bugs

While experimenting with multiple units of the lander, I discovered
the way we manage our relationships in this charm are all wrong.
Basically, they were working off relation-id which is unique to a
relationship and won't take into account multiple units within a
relationship. We used the "relation-id" because its available during
a relation-broken function. However, I also learned that the broken
function is the wrong place to handle what we want. We really want
to be called during the "departed" hook. This will still include
the full context of the relationship and will allow us to handle
multiple units.

Description of the change

discovered some charm issues when trying multiple lander units. this is going to require a destroy-environment to deploy correctly

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

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

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

review: Approve (continuous-integration)
Revision history for this message
Celso Providelo (cprov) wrote :

Code looks good, but I have few points that need information, see the diff comments.

review: Needs Information
602. By Andy Doan

merge with trunk

603. By Andy Doan

review fixes noticed by cprov

Revision history for this message
Andy Doan (doanac) wrote :

should be fixed in revno 603.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

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

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

review: Approve (continuous-integration)
Revision history for this message
Celso Providelo (cprov) wrote :

Thanks for addressing my comments.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches