Merge lp:~mandel/ubuntuone-control-panel/add-app-name into lp:ubuntuone-control-panel

[Manuel de la Peña]

- Added the app name from ubuntu one to be used in the webclient so that it is shown in the sso ui (LP: #952880).

- Added the app name from ubuntu one to be used in the webclient so that it is shown in the sso ui (LP: #952880).

[Diego Sarmentero (diegosarmentero)]

needs tests

review: Needs Fixing

[lp:~mandel/ubuntuone-control-panel/add-app-name]

283. By Manuel de la Peña on 2012-03-13

Added test to ensure that the correct app name is used.

[Diego Sarmentero (diegosarmentero)]

+1

review: Approve

[Natalia Bidart (nataliabidart)]

Looks good, though the platform import is out of order :-).

review: Approve

=== modified file 'ubuntuone/controlpanel/tests/test_web_client.py'
--- ubuntuone/controlpanel/tests/test_web_client.py	2012-03-05 12:36:56 +0000
+++ ubuntuone/controlpanel/tests/test_web_client.py	2012-03-13 11:29:19 +0000
@@ -29,6 +29,7 @@
     WebClient,
     WebClientError,
 )
+from ubuntuone.platform.credentials import APP_NAME
 
 
 SAMPLE_KEY = "result"
@@ -104,6 +105,10 @@
         self.wc = WebClient(sample_get_credentials, base_url=self.base_iri)
         self.addCleanup(self.wc.shutdown)
 
+    def test_correct_app_name(self):
+        """Assert that the wc uses the correct appname."""
+        self.assertEqual(APP_NAME, self.wc.wc.appname)
+
     @defer.inlineCallbacks
     def test_get_url(self):
         """A method is successfully called in the mock webservice."""

=== modified file 'ubuntuone/controlpanel/web_client.py'
--- ubuntuone/controlpanel/web_client.py	2012-02-06 16:28:26 +0000
+++ ubuntuone/controlpanel/web_client.py	2012-03-13 11:29:19 +0000
@@ -30,7 +30,7 @@
 
 from ubuntuone.controlpanel import WEBSERVICE_BASE_URL
 from ubuntuone.controlpanel.logger import setup_logging
-
+from ubuntuone.platform.credentials import APP_NAME
 
 logger = setup_logging('webclient')
 
@@ -42,7 +42,7 @@
         """Initialize the webclient."""
         self.base_url = base_url
         self.get_credentials = get_credentials
-        self.wc = webclient_factory()
+        self.wc = webclient_factory(APP_NAME)
         logger.debug("WebClient created: base_url is %r, inner client is %r.",
                      self.base_url, self.wc)