Merge lp:~frankban/charms/precise/juju-gui/improve-error-handling into lp:~juju-gui/charms/precise/juju-gui/trunk
Status: | Merged |
---|---|
Merged at revision: | 122 |
Proposed branch: | lp:~frankban/charms/precise/juju-gui/improve-error-handling |
Merge into: | lp:~juju-gui/charms/precise/juju-gui/trunk |
Diff against target: |
137 lines (+43/-5) 6 files modified
hooks/utils.py (+3/-0) revision (+1/-1) server/guiserver/handlers.py (+4/-2) server/guiserver/tests/bundles/test_base.py (+30/-0) server/guiserver/tests/test_handlers.py (+3/-0) tests/requirements.pip (+2/-2) |
To merge this branch: | bzr merge lp:~frankban/charms/precise/juju-gui/improve-error-handling |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
charmers | Pending | ||
Review via email: mp+194398@code.launchpad.net |
Description of the change
Improve bundle deployment error handling.
Workaround for http://
Include a customized jujuclient tarball in the
charm, The diff with the original is here:
http://
Add a first fix to the testing environment creation
so that the local dependencies are installed
when available.
Also fixed the headers sent by the info handler.
Tests: make unittest
QA:
I used this bundle: http://
to live test the branch.
Bootstrap a juju environment, run `make deploy` and then
switch the gui source to lp:juju-gui.
When everything is ready, try to deploy the bundle above:
it will fail because it includes local charms, but the
server will not explode, and it will be possible
to deploy other valid bundles after the first one.
The GUI user does not receive notifications, and that's
normal since deployments are not yet watched by the GUI.
Go to https://[GUI URL]/gui-
find the deployment status to be completed with the
expected error.
Reviewers: mp+194398_ code.launchpad. net,
Message:
Please take a look.
Description:
Improve bundle deployment error handling.
Workaround for http:// bugs.python. org/issue169233 5.
Include a customized jujuclient tarball in the pastebin. ubuntu. com/6377430/
charm, The diff with the original is here:
http://
Add a first fix to the testing environment creation
so that the local dependencies are installed
when available.
Also fixed the headers sent by the info handler.
Tests: make unittest
QA: pastebin. ubuntu. com/6377441/ server- info and you should
I used this bundle: http://
to live test the branch.
Bootstrap a juju environment, run `make deploy` and then
switch the gui source to lp:juju-gui.
When everything is ready, try to deploy the bundle above:
it will fail because it includes local charms, but the
server will not explode, and it will be possible
to deploy other valid bundles after the first one.
The GUI user does not receive notifications, and that's
normal since deployments are not yet watched by the GUI.
Go to https://[GUI URL]/gui-
find the deployment status to be completed with the
expected error.
https:/ /code.launchpad .net/~frankban/ charms/ precise/ juju-gui/ improve- error-handling/ +merge/ 194398
(do not edit description out of merge proposal)
Please review this at https:/ /codereview. appspot. com/23000043/
Affected files (+44, -4 lines): -0.13.tar. gz guiserver/ handlers. py guiserver/ tests/bundles/ test_base. py guiserver/ tests/test_ handlers. py nts.pip
A [revision details]
M deps/jujuclient
M hooks/utils.py
M revision
M server/
M server/
M server/
M tests/requireme
Index: [revision details]
=== added file '[revision details]'
--- [revision details] 2012-01-01 00:00:00 +0000
+++ [revision details] 2012-01-01 00:00:00 +0000
@@ -0,0 +1,2 @@
+Old revision:
<email address hidden>
+New revision:
<email address hidden>
Index: revision
=== modified file 'revision'
--- revision 2013-11-07 11:18:20 +0000
+++ revision 2013-11-07 16:02:01 +0000
@@ -1,1 +1,1 @@
-93
+94
Index: deps/jujuclient -0.13.tar. gz t-0.13. tar.gz' -0.13.tar. gz 2013-11-06 18:48:54 +0000 and -0.13.tar. gz 2013-11-07 17:27:20 +0000 differ
=== modified file 'deps/jujuclien
Binary files deps/jujuclient
deps/jujuclient
Index: hooks/utils.py futures- 2.1.4.tar. gz', tornado- 3.1.1.tar. gz', websocket- client- 0.12.0. tar.gz' , jujuclient- 0.13.tar. gz',
=== modified file 'hooks/utils.py'
--- hooks/utils.py 2013-11-07 14:41:27 +0000
+++ hooks/utils.py 2013-11-07 17:27:20 +0000
@@ -119,6 +119,9 @@
'
'
'
+ # XXX frankban 2013-11-07: we are currently using a customized
jujuclient
+ # version built from this branch:
+ # lp:~frankban/python-jujuclient/pickable-enverror.
'
# XXX frankban 2013-11-07: we are currently using a customized deployer
# version built from this branch:
lp:~frankban/juju-deployer/guienv-fixes.
Index: server/ guiserver/ handlers. py guiserver/ handlers. py' guiserver/ handlers. py 2013-10-17 12:47:15 +0000 guiserver/ handlers. py 2013-11-07 18:04:32 +0000
=== modified file 'server/
--- server/
+++ server/
@@ -22,7 +22,6 @@
import time
...