Merge branch 'master' of git@83.233.175.44:hermes

Conflicts:

	package/src/org/maemo/hermes/engine/linkedin/api.py

diff --git a/package/src/org/maemo/hermes/engine/linkedin/api.py b/package/src/org/maemo/hermes/engine/linkedin/api.py
index 6eaf200..fe0c80f 100644 (file)
--- a/package/src/org/maemo/hermes/engine/linkedin/api.py
+++ b/package/src/org/maemo/hermes/engine/linkedin/api.py
@@ -158,6 +158,9 @@ class LinkedInApi():
         try:
             token = oauth.OAuthToken.from_string(response)
         except Exception, e:
+            import traceback
+            traceback.print_exc()
+            print response
             raise Exception("Authorization failure - failed to get request token")
         return token
 
@@ -184,8 +187,8 @@ class LinkedInApi():
         connection.request(oauth_request.http_method, self.ACCESS_TOKEN_URL, headers=oauth_request.to_header()) 
         response = connection.getresponse()
         token_str = response.read()
-        if "ouath_problem" in token_str:
-            raise Exception("Authorization failure - failed to get access token")
+        if 'oauth_problem' in token_str:
+            raise Exception("Authorization failure - failed to get access token (" + token_str + ")")
         self._store_access_token_in_gconf(token_str)
         return oauth.OAuthToken.from_string(token_str)
 
@@ -201,7 +204,7 @@ class LinkedInApi():
         except Exception, e:
             import traceback
             traceback.print_exc()
-            raise Exception("LinkedIn authorization failed, try again (" + e + ")")
+            raise Exception("LinkedIn authorization failed, try again")
 
 
     # -----------------------------------------------------------------------

diff --git a/package/test/integration/test_linkedinapi.py b/package/test/integration/test_linkedinapi.py
index 0547300..2e38d9f 100644 (file)
--- a/package/test/integration/test_linkedinapi.py
+++ b/package/test/integration/test_linkedinapi.py
@@ -50,22 +50,23 @@ class IntegrationTestLinkedInApi(unittest.TestCase):
         #if True:
             self.testee.authenticate(self._need_auth_cb, self._block_for_auth)
             assert False # should always go to except clause
-        except:
+        except Exception, e:
             authenticate_threw_exception = True
         
+        assert authenticate_threw_exception
         assert self.need_auth_called
         assert self.block_for_auth_called
         assert self.block_for_auth_show_input_field
-        assert authenticate_threw_exception
 
 
     def _need_auth_cb(self):
         self.need_auth_called = True
 
 
-    def _block_for_auth(self, show_input_field):
+    def _block_for_auth(self, show_input_field, url=None):
         self.block_for_auth_called = True
         self.block_for_auth_show_input_field = show_input_field
+        self.block_for_auth_url = url
         return self.verifier
 
     

diff --git a/package/test/manual/test_linkedinapi.py b/package/test/manual/test_linkedinapi.py
index ec5b486..bb7f7cf 100644 (file)
--- a/package/test/manual/test_linkedinapi.py
+++ b/package/test/manual/test_linkedinapi.py
@@ -3,6 +3,7 @@ from org.maemo.hermes.engine.linkedin.api import LinkedInApi
 from org.maemo.hermes.engine.names import canonical
 from org.maemo.hermes.engine.friend import Friend
 import unittest, sys
+import httplib
 
 def log(msg):
     sys.__stderr__.write(msg + "\n")
@@ -38,10 +39,10 @@ class TestLinkedInApi(unittest.TestCase):
         # uncomment next line if you need to authorize ...
         #self.testee.authenticate(self._need_auth_cb, self._block_for_auth)
         # ... or uncomment the following four lines - replacing the oauth_token string with whatever you got
-        #self.gconf.set_string(
-        #          LinkedInApi.GCONF_ACCESS_TOKEN, 
-        #          'oauth_token=f89c2b7b-1c12-4f83-a469-838e78901716&oauth_token_secret=60f817af-6437-4015-962f-cc3aefee0264')
-        #self.testee = LinkedInApi(self.gconf)
+        self.gconf.set_string(
+                  LinkedInApi.GCONF_ACCESS_TOKEN, 
+                  'oauth_token=f89c2b7b-1c12-4f83-a469-838e78901716&oauth_token_secret=60f817af-6437-4015-962f-cc3aefee0264')
+        self.testee = LinkedInApi(self.gconf)
         
         # uncomment to see the raw xml feed for all connections
         #xml = self.testee._make_api_request(LinkedInApi.LI_CONN_API_URL)
@@ -62,7 +63,7 @@ class TestLinkedInApi(unittest.TestCase):
         self.need_auth_called = True
 
 
-    def _block_for_auth(self, url):
+    def _block_for_auth(self, verifier, url=None):
         import os, time
         file = "/tmp/verifier"
         verifier = None