Merge lp:~nataliabidart/ubuntu-sso-client/build-lucid into lp:ubuntu-sso-client

[Natalia Bidart]

- Stop using file: uris and patch urlopen to avoid crashes (LP: #839544).

[Roberto Alsina (ralsina)]

+1 trivial

review: Approve

=== modified file 'ubuntu_sso/tests/test_account.py'
--- ubuntu_sso/tests/test_account.py	2011-08-22 18:20:09 +0000
+++ ubuntu_sso/tests/test_account.py	2011-09-02 13:09:18 +0000
@@ -18,6 +18,7 @@
 """Tests for the SSO account code."""
 
 import os
+import urllib2
 
 # Unable to import 'lazr.restfulclient.*'
 # pylint: disable=F0401
@@ -50,7 +51,7 @@
 class FakedCaptchas(object):
     """Fake the captcha generator."""
 
-    image_uri = 'file://localhost/%s' % CAPTCHA_PATH.replace(os.path.sep, '/')
+    image_uri = CAPTCHA_PATH
 
     def new(self):
         """Return a local fake captcha."""
@@ -149,6 +150,14 @@
 
     def setUp(self):
         """Init."""
+
+        def fake_urlopen(url):
+            """Fake an urlopen which will read from the disk."""
+            f = open(url)
+            self.addCleanup(f.close)
+            return f
+
+        self.patch(urllib2, 'urlopen', fake_urlopen)  # fd to the path
         self.processor = Account(sso_service_class=FakedSSOServer)
         self.register_kwargs = dict(email=EMAIL, password=PASSWORD,
                                     displayname=NAME,