Skip to content

Commit 8d9b409

Browse files
author
Josh Hoyt
committed
[project @ Make test_discover check against getLocalID instead of the local_id attribute]
Also fix bug where canonical ID was being used instead of the local_id
1 parent 11d7398 commit 8d9b409

2 files changed

Lines changed: 6 additions & 5 deletions

File tree

‎openid/consumer/discover.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ def getLocalID(self):
8484
if (self.local_id is self.canonicalID is None):
8585
return self.claimed_id
8686
else:
87-
return self.canonicalID or self.local_id
87+
return self.local_id or self.canonicalID
8888

8989
def isIdentifierSelect(self):
9090
return self.claimed_id is None

‎openid/test/test_discover.py‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -180,9 +180,10 @@ def _checkService(self, s,
180180
self.failIf(local_id)
181181
self.failIf(s.claimed_id)
182182
self.failIf(s.local_id)
183+
self.failIf(s.getLocalID())
183184
else:
184185
self.failUnlessEqual(claimed_id, s.claimed_id)
185-
self.failUnlessEqual(local_id, s.local_id)
186+
self.failUnlessEqual(local_id, s.getLocalID())
186187

187188
if used_yadis:
188189
self.failUnless(s.used_yadis, "Expected to use Yadis")
@@ -248,7 +249,7 @@ def test_noOpenID(self):
248249
types=['1.1'],
249250
server_url="http://www.myopenid.com/server",
250251
claimed_id=self.id_url,
251-
local_id=None,
252+
local_id=self.id_url,
252253
)
253254

254255
def test_html1(self):
@@ -336,7 +337,7 @@ def test_yadis1NoDelegate(self):
336337
types=['1.0'],
337338
server_url="http://www.myopenid.com/server",
338339
claimed_id=self.id_url,
339-
local_id=None,
340+
local_id=self.id_url,
340341
)
341342

342343
def test_yadis2NoLocalID(self):
@@ -352,7 +353,7 @@ def test_yadis2NoLocalID(self):
352353
types=['2.0'],
353354
server_url="http://www.myopenid.com/server",
354355
claimed_id=self.id_url,
355-
local_id=None,
356+
local_id=self.id_url,
356357
)
357358

358359
def test_yadis2(self):

0 commit comments

Comments
 (0)