@@ -278,9 +278,9 @@ def approve_test_helper(self,approve_type):
278278 q = PyQuery (r .content )
279279 self .assertEqual (len (q ('[type=submit]:contains("Send announcement")' )), 1 )
280280 if approve_type == 'appr-noprob' :
281- self .assertTrue ( 'IESG has no problem' in '' .join (wrap (r .content ,2 ** 16 )))
281+ self .assertIn ( 'IESG has no problem' , '' .join (wrap (r .content ,2 ** 16 )))
282282 else :
283- self .assertTrue ( 'NOT be published' in '' .join (wrap (r .content ,2 ** 16 )))
283+ self .assertIn ( 'NOT be published' , '' .join (wrap (r .content ,2 ** 16 )))
284284
285285 # submit
286286 empty_outbox ()
@@ -292,14 +292,14 @@ def approve_test_helper(self,approve_type):
292292 self .assertFalse (doc .ballot_open ("conflrev" ))
293293
294294 self .assertEqual (len (outbox ), 1 )
295- self .assertTrue ('Results of IETF-conflict review' in outbox [0 ]['Subject' ])
296- self .assertTrue ('irtf-chair' in outbox [0 ]['To' ])
297- self .assertTrue ('ietf-announce@' in outbox [0 ]['Cc' ])
298- self .assertTrue ('iana@' in outbox [0 ]['Cc' ])
295+ self .assertIn ('Results of IETF-conflict review' , outbox [0 ]['Subject' ])
296+ self .assertIn ('irtf-chair' , outbox [0 ]['To' ])
297+ self .assertIn ('ietf-announce@' , outbox [0 ]['Cc' ])
298+ self .assertIn ('iana@' , outbox [0 ]['Cc' ])
299299 if approve_type == 'appr-noprob' :
300- self .assertTrue ( 'IESG has no problem' in '' .join (wrap (unicode (outbox [0 ]),2 ** 16 )))
300+ self .assertIn ( 'IESG has no problem' , '' .join (wrap (unicode (outbox [0 ]),2 ** 16 )))
301301 else :
302- self .assertTrue ( 'NOT be published' in '' .join (wrap (unicode (outbox [0 ]),2 ** 16 )))
302+ self .assertIn ( 'NOT be published' , '' .join (wrap (unicode (outbox [0 ]),2 ** 16 )))
303303
304304
305305 def test_approve_reqnopub (self ):
0 commit comments