@@ -6,14 +6,14 @@ class KVBaseTest(unittest.TestCase):
66 def shortDescription (self ):
77 return '%s test for %r' % (self .__class__ .__name__ , self .kvform )
88
9- def log (self , unused_message , unused_priority = None ):
10- self .warnings += 1
9+ def log (self , message , unused_priority = None ):
10+ self .warnings . append ( message )
1111
1212 def checkWarnings (self , num_warnings ):
13- self .failUnlessEqual (num_warnings , self .warnings )
13+ self .failUnlessEqual (num_warnings , len ( self .warnings ), repr ( self . warnings ) )
1414
1515 def setUp (self ):
16- self .warnings = 0
16+ self .warnings = []
1717 self .old_log = oidutil .log
1818 self .log_func = oidutil .log = self .log
1919 self .failUnless (self .log_func is oidutil .log ,
@@ -46,10 +46,11 @@ def runTest(self):
4646 self .failUnlessEqual (d , d2 )
4747
4848class KVSeqTest (KVBaseTest ):
49- def __init__ (self , seq , kv ):
49+ def __init__ (self , seq , kv , expected_warnings ):
5050 unittest .TestCase .__init__ (self )
5151 self .kvform = kv
5252 self .seq = seq
53+ self .expected_warnings = expected_warnings
5354
5455 def cleanSeq (self , seq ):
5556 """Create a new sequence by stripping whitespace from start
@@ -71,6 +72,7 @@ def runTest(self):
7172 clean_seq = self .cleanSeq (seq )
7273
7374 self .failUnlessEqual (seq , clean_seq )
75+ self .checkWarnings (self .expected_warnings )
7476
7577kvdict_cases = [
7678 # (kvform, parsed dictionary, expected warnings)
@@ -105,13 +107,14 @@ def runTest(self):
105107 ]
106108
107109kvseq_cases = [
108- ([], '' ),
109- ([('openid' , 'useful' ), ('a' , 'b' )], 'openid:useful\n a:b\n ' ),
110- ([(' openid' , 'useful' ), ('a' , 'b' )], ' openid:useful\n a:b\n ' ),
110+ ([], '' , 0 ),
111+ ([('openid' , 'useful' ), ('a' , 'b' )], 'openid:useful\n a:b\n ' , 0 ),
112+ ([(' openid' , 'useful' ), ('a' , 'b' )], ' openid:useful\n a:b\n ' , 2 ),
111113 ([(' openid ' , ' useful ' ),
112- (' a ' , ' b ' )], ' openid : useful \n a : b \n ' ),
114+ (' a ' , ' b ' )], ' openid : useful \n a : b \n ' , 8 ),
113115 ([(' open id ' , ' use ful ' ),
114- (' a ' , ' b ' )], ' open id : use ful \n a : b \n ' ),
116+ (' a ' , ' b ' )], ' open id : use ful \n a : b \n ' , 8 ),
117+ ([(u'foo' , 'bar' )], 'foo:bar\n ' , 0 ),
115118 ]
116119
117120kvexc_cases = [
0 commit comments