Merge lp://qastaging/~frankban/charms/precise/juju-gui/invalid-pyjuju-ws into lp://qastaging/~juju-gui/charms/precise/juju-gui/trunk

Reviewers: mp+183229_code.launchpad.net,

Message:
Please take a look.

Description:
Fix WebSocket URL in pyJuju.

The WS URL must include the /ws path when
the GUI is connected to rapi.

https://code.launchpad.net/~frankban/charms/precise/juju-gui/invalid-pyjuju-ws/+merge/183229

(do not edit description out of merge proposal)

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

Affected files:
   A [revision details]
   M hooks/utils.py
   M revision
   M tests/test_utils.py

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-08-30 13:21:52 +0000
+++ revision 2013-08-30 15:41:34 +0000
@@ -1,1 +1,1 @@
-79
+80

Index: hooks/utils.py
=== modified file 'hooks/utils.py'
--- hooks/utils.py 2013-08-26 15:53:22 +0000
+++ hooks/utils.py 2013-08-30 15:41:34 +0000
@@ -560,7 +560,7 @@
      if not sandbox:
          is_legacy_juju = legacy_juju()
          if is_legacy_juju:
- api_url = 'wss://127.0.0.1:{}'.format(API_PORT)
+ api_url = 'wss://127.0.0.1:{}/ws'.format(API_PORT)
          else:
              api_url = 'wss://{}'.format(get_api_address())
          context.update({

Index: tests/test_utils.py
=== modified file 'tests/test_utils.py'
--- tests/test_utils.py 2013-08-26 15:53:22 +0000
+++ tests/test_utils.py 2013-08-30 16:29:57 +0000
@@ -734,7 +734,7 @@
          guiserver_conf = self.files['guiserver.conf']
          self.assertIn('description "GUIServer"', guiserver_conf)
          self.assertIn('--logging="info"', guiserver_conf)
- self.assertIn('--apiurl="wss://127.0.0.1:8080"', guiserver_conf)
+ self.assertIn('--apiurl="wss://127.0.0.1:8080/ws"', guiserver_conf)
          self.assertIn('--apiversion="python"', guiserver_conf)
          self.assertIn(
              '--testsroot="{}/test/"'.format(JUJU_GUI_DIR), guiserver_conf)

Self review: critical.

https://codereview.appspot.com/13432043/

*** Submitted:

Fix WebSocket URL in pyJuju.

The WS URL must include the /ws path when
the GUI is connected to rapi.

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

https://codereview.appspot.com/13432043/