lp://staging/~gary/juju-gui/ci2

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp://staging/juju-gui/experimental at revision 478

Juju GUI Hackers: Pending requested 2013-03-29

Diff: 90 lines (+27/-15)

2 files modified

lib/deploy_charm_for_testing.py (+13/-6)
test/test_charm_running.py (+14/-9)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

479. By Gary Poster on 2013-04-01

merge trunk to try and resolve submission issues

478. By Gary Poster on 2013-03-29

only specify an instance type in canonistack

477. By Gary Poster on 2013-03-29

try multiple retries of unit tests

476. By Richard Harding on 2013-03-29

Create a view for the browser charm details.

- Drive by fixes for some missing deps
- Drive by for the api url in the prod config
- Refactory out the logic of the charm details from Fullscreen to it's own
view so it can be reused hopefully in the Sidebar View as well.
- Add the icon to the BrowserCharm model since it's new.
- Add the `file` Charmworld API endpoint used for loading the readme contents
if available.
- Fix broken HTML heh
- Add events with place holder functions for clicking 'add' and 'open
changelog'.
- Add basic tests for the BrowserCharmView
- If you want to QA, go to /bws/sidebar and select one of the charm links
displayed. It will load details for that charm. Note: there's an upstream
Charmworld API issue if the charm *does* have a README file. It'll throw an
error currently and a fix to Charmworld is submitted but not in staging yet.

R=jeff.pihach, j.c.sackett
CC=
https://codereview.appspot.com/8103046

475. By Francesco Banconi on 2013-03-29

Clean up data sent to the juju-core API

This branch includes three fixes:
- null values are removed;
- annotations are sent as strings (as required by the API server);
- the deploy call sends service config values as strings
  (as required by the API server).

R=gary.poster, jeff.pihach
CC=
https://codereview.appspot.com/8153043

474. By Jeff Pihach on 2013-03-28

Moved the YUI sandbox into the describe closure

For whatever reason one of the describe closures in test_model.js
was wrapped in a YUI sandbox. This caused whatever test suite was
run after it in .only mode to fail with an extend failure. Moving
the YUI sandbox inside to match our other tests has solved this.

R=gary.poster, rharding
CC=
https://codereview.appspot.com/8099047

473. By Benji York on 2013-03-28

- remove stage step from release procedure
- add simpler mode bit checking with command to do it for you

472. By Benji York on 2013-03-28

merge from trunk

471. By Benji York on 2013-03-28

Set version back to unreleased.

470. By Benji York on 2013-03-28

merge from trunk