incubator-heraldry-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ket...@apache.org
Subject svn commit: r493336 - /incubator/heraldry/libraries/python/openid/trunk/openid/test/test_discover.py
Date Sat, 06 Jan 2007 05:22:33 GMT
Author: keturn
Date: Fri Jan  5 21:22:33 2007
New Revision: 493336

URL: http://svn.apache.org/viewvc?view=rev&rev=493336
Log:
[python-to-heraldry @ Resolve conflict]

Original author: cygnus@janrain.com
Date: 2006-12-20 00:14:46+00:00

Modified:
    incubator/heraldry/libraries/python/openid/trunk/openid/test/test_discover.py

Modified: incubator/heraldry/libraries/python/openid/trunk/openid/test/test_discover.py
URL: http://svn.apache.org/viewvc/incubator/heraldry/libraries/python/openid/trunk/openid/test/test_discover.py?view=diff&rev=493336&r1=493335&r2=493336
==============================================================================
--- incubator/heraldry/libraries/python/openid/trunk/openid/test/test_discover.py (original)
+++ incubator/heraldry/libraries/python/openid/trunk/openid/test/test_discover.py Fri Jan
 5 21:22:33 2007
@@ -405,15 +405,6 @@
             data=readDataFile('openid_1_and_2.html'),
             expected_services=2)
 
-        self.failUnlessEqual(services[1].server_url,
-                             "http://www.myopenid.com/server")
-        self.failUnlessEqual(services[1].claimed_id, self.id_url)
-        self.failUnlessEqual('http://smoker.myopenid.com/',
-                             services[1].local_id)
-        self.failUnlessEqual([discover.OPENID_2_0_TYPE], services[1].type_uris)
-        self._notUsedYadis(services[1])
-
-
         self.failUnlessEqual(services[0].server_url,
                              "http://www.myopenid.com/server")
         self.failUnlessEqual(services[0].claimed_id, self.id_url)
@@ -421,7 +412,7 @@
                              services[0].local_id)
         self.failUnlessEqual([discover.OPENID_2_0_TYPE], services[0].type_uris)
         self._notUsedYadis(services[0])
-        self._hasTypes(services[0], '1.1')
+        self._hasTypes(services[0], '2.0')
 
 
         self.failUnlessEqual(services[1].server_url,
@@ -431,6 +422,7 @@
                              services[1].local_id)
         self.failUnlessEqual([discover.OPENID_1_1_TYPE], services[1].type_uris)
         self._notUsedYadis(services[1])
+        self._hasTypes(services[1], '1.1')
 
 
 class MockFetcherForXRIProxy(object):



Mime
View raw message