@@ -47,7 +47,6 @@ def test_browserWithReturnTo(self):
4747 expected_args = {
4848 'openid.mode' : ['error' ],
4949 'openid.error' : ['plucky' ],
50- 'openid.ns' : [OPENID1_NS ],
5150 }
5251
5352 rt_base , result_args = e .encodeToURL ().split ('?' , 1 )
@@ -111,7 +110,6 @@ def test_browserWithReturnTo_OpenID1_exceeds_limit(self):
111110 expected_args = {
112111 'openid.mode' : ['error' ],
113112 'openid.error' : ['plucky' ],
114- 'openid.ns' : [OPENID1_NS ],
115113 }
116114
117115 self .failUnless (e .whichEncoding () == server .ENCODE_URL )
@@ -130,8 +128,7 @@ def test_noReturnTo(self):
130128 self .failIf (e .hasReturnTo ())
131129 expected = """error:waffles
132130mode:error
133- ns:%s
134- """ % OPENID1_NS
131+ """
135132 self .failUnlessEqual (e .encodeToKVForm (), expected )
136133
137134
@@ -763,7 +760,7 @@ def test_encodableError(self):
763760 'openid.mode' : 'associate' ,
764761 'openid.identity' : 'http://limu.unittest/' ,
765762 })
766- body = "error:snoot\n mode:error\n ns:%s \n " % OPENID1_NS
763+ body = "error:snoot\n mode:error\n "
767764 webresponse = self .encode (server .ProtocolError (args , "snoot" ))
768765 self .failUnlessEqual (webresponse .code , server .HTTP_ERROR )
769766 self .failUnlessEqual (webresponse .headers , {})
@@ -973,27 +970,6 @@ def _expectAnswer(self, answer, identity=None, claimed_id=None):
973970 len (expected_list ) + 2 ,
974971 answer .fields .toPostArgs ())
975972
976- def _expectAnswerv1 (self , answer , identity = None ):
977- expected_list = [
978- ('mode' , 'id_res' ),
979- ('return_to' , self .request .return_to ),
980- ('identity' , identity ),
981- ]
982-
983- for k , expected in expected_list :
984- actual = answer .fields .getArg (OPENID_NS , k )
985- self .failUnlessEqual (actual , expected , "%s: expected %s, got %s" % (k , expected , actual ))
986-
987- self .failUnless (answer .fields .hasKey (OPENID_NS , 'response_nonce' ))
988- self .failUnlessEqual (answer .fields .getOpenIDNamespace (), OPENID1_NS )
989- self .failIf (answer .fields .namespaces .isImplicit (OPENID1_NS ))
990-
991- # One for nonce, one for namespace
992- self .failUnlessEqual (len (answer .fields .toPostArgs ()),
993- len (expected_list ) + 2 ,
994- answer .fields .toPostArgs ())
995-
996-
997973 def test_answerAllow (self ):
998974 """Check the fields specified by "Positive Assertions"
999975
@@ -1178,14 +1154,35 @@ def test_answerAllowNoEndpointOpenID1(self):
11781154 """Test .allow() with an OpenID 1.x Message on a CheckIDRequest
11791155 built without an op_endpoint parameter.
11801156 """
1157+ identity = 'http://bambam.unittest/'
11811158 reqmessage = Message .fromOpenIDArgs ({
1182- 'identity' : 'http://bambam.unittest/' ,
1159+ 'identity' : identity ,
11831160 'trust_root' : 'http://bar.unittest/' ,
11841161 'return_to' : 'http://bar.unittest/999' ,
11851162 })
11861163 self .request = server .CheckIDRequest .fromMessage (reqmessage , None )
11871164 answer = self .request .answer (True )
1188- self ._expectAnswerv1 (answer , 'http://bambam.unittest/' )
1165+
1166+ expected_list = [
1167+ ('mode' , 'id_res' ),
1168+ ('return_to' , self .request .return_to ),
1169+ ('identity' , identity ),
1170+ ]
1171+
1172+ for k , expected in expected_list :
1173+ actual = answer .fields .getArg (OPENID_NS , k )
1174+ self .failUnlessEqual (
1175+ expected , actual ,
1176+ "%s: expected %s, got %s" % (k , expected , actual ))
1177+
1178+ self .failUnless (answer .fields .hasKey (OPENID_NS , 'response_nonce' ))
1179+ self .failUnlessEqual (answer .fields .getOpenIDNamespace (), OPENID1_NS )
1180+ self .failUnless (answer .fields .namespaces .isImplicit (OPENID1_NS ))
1181+
1182+ # One for nonce (OpenID v1 namespace is implicit)
1183+ self .failUnlessEqual (len (answer .fields .toPostArgs ()),
1184+ len (expected_list ) + 1 ,
1185+ answer .fields .toPostArgs ())
11891186
11901187 def test_answerImmediateDenyOpenID2 (self ):
11911188 """Look for mode=setup_needed in checkid_immediate negative
@@ -1216,9 +1213,9 @@ def test_answerImmediateDenyOpenID1(self):
12161213 # crappiting setup_url, you dirty my interface with your presence!
12171214 answer = self .request .answer (False , server_url = server_url )
12181215 self .failUnlessEqual (answer .request , self .request )
1219- self .failUnlessEqual (len (answer .fields .toPostArgs ()), 3 , answer .fields )
1216+ self .failUnlessEqual (len (answer .fields .toPostArgs ()), 2 , answer .fields )
12201217 self .failUnlessEqual (answer .fields .getOpenIDNamespace (), OPENID1_NS )
1221- self .failIf (answer .fields .namespaces .isImplicit (OPENID1_NS ))
1218+ self .failUnless (answer .fields .namespaces .isImplicit (OPENID1_NS ))
12221219 self .failUnlessEqual (answer .fields .getArg (OPENID_NS , 'mode' ), 'id_res' )
12231220 self .failUnless (answer .fields .getArg (
12241221 OPENID_NS , 'user_setup_url' , '' ).startswith (server_url ))
0 commit comments