Merge lp://staging/~gary/juju-gui/bug1169350 into lp://staging/juju-gui/experimental

Reviewers: mp+159271_code.launchpad.net,

Message:
Please take a look.

Description:
gallimaufry

Title is in homage to benji's potpourri.

- Fix 1169350: sandbox was not marking subordinate charms correctly.
- Fix 1169668: subordinate relations were not shown because of the id
change.
- Simplify test charm store code.

https://code.launchpad.net/~gary/juju-gui/bug1169350/+merge/159271

(do not edit description out of merge proposal)

Please review this at https://codereview.appspot.com/8812043/

Affected files:
   A [revision details]
   M app/store/env/fakebackend.js
   M app/views/topology/relation.js
   M test/test_app.js
   M test/test_fakebackend.js
   M test/test_sandbox.js
   M test/utils.js

LGTM - thanks for the fixes and the test util.

https://codereview.appspot.com/8812043/

LGTM nice improvements!

https://codereview.appspot.com/8812043/diff/1/app/store/env/fakebackend.js
File app/store/env/fakebackend.js (right):

https://codereview.appspot.com/8812043/diff/1/app/store/env/fakebackend.js#newcode344
app/store/env/fakebackend.js:344: data.is_subordinate =
data.subordinate;
Ahh it was a naming mixup.

https://codereview.appspot.com/8812043/diff/1/test/utils.js
File test/utils.js (right):

https://codereview.appspot.com/8812043/diff/1/test/utils.js#newcode62
test/utils.js:62: _cached_charms: (function() {
Great idea

https://codereview.appspot.com/8812043/

*** Submitted:

gallimaufry

Title is in homage to benji's potpourri.

- Fix 1169350: sandbox was not marking subordinate charms correctly.
- Fix 1169668: subordinate relations were not shown because of the id
change.
- Simplify test charm store code.

R=matthew.scott, jeff.pihach
CC=
https://codereview.appspot.com/8812043

https://codereview.appspot.com/8812043/