lp:~frankban/charms/precise/juju-gui/guiserver-async-watcher

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:~juju-gui/charms/precise/juju-gui/trunk at revision 91

charmers: Pending requested 2013-08-14

Diff: 666 lines (+620/-6)

6 files modified

revision (+1/-1)
server/guiserver/bundles/__init__.py (+252/-0)
server/guiserver/tests/bundles/__init__.py (+17/-0)
server/guiserver/tests/test_watchers.py (+193/-0)
server/guiserver/watchers.py (+132/-0)
tests/requirements.pip (+25/-5)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

97. By Francesco Banconi on 2013-08-19

Merged trunk and bumped up revision.

96. By Francesco Banconi on 2013-08-19

Changes as per review.

95. By Francesco Banconi on 2013-08-14

Changes as per review.

94. By Francesco Banconi on 2013-08-14

Checkpoint.

93. By Francesco Banconi on 2013-08-14

Checkpoint.

92. By Francesco Banconi on 2013-08-14

Add the bundles module.

91. By Francesco Banconi on 2013-08-14

Add the async watcher.

90. By Francesco Banconi on 2013-08-14

Bumped up revision and updated requirements.

89. By Nicola Larosa on 2013-08-09

Integrate the built-in server into the charm.

Add a "builtin-server" option to config.yaml, defaulting to false, to enable
a new Tornado-based built-in web server, in place of haproxy and Apache (still
the default).

Add a "guiserver.conf" Upstart config file, generated via a template.

Add a BuiltinServerMixin to hooks/backend.py .

Add tests for the new functions in hooks/utils.py .

Clean up all paths and constants in hooks/utils.py .

Miscellaneuos cleanup.

QA1 (quick):

$ make unittest

QA2 (long, 40 minutes):

$ make ftest

QA3 (long but shorter than the former):

$ juju bootstrap
$ make deploy
  (check web access)
$ juju set juju-gui builtin-server=true
  (check web access)
$ juju set juju-gui builtin-server=false
  (check web access)
$ juju destroy-environment

R=frankban, matthew.scott
CC=
https://codereview.appspot.com/12650044

88. By Francesco Banconi on 2013-08-08

Fix charm functional tests.

Updated Selenium to the last version: it includes
a fix for Firefox 23.

Also updated the force-machine test: use the new
--to juju-core option.

R=
CC=
https://codereview.appspot.com/12665043