diff options
| author | Florian Klien <flowolf@klienux.org> | 2018-10-08 23:25:23 +0200 |
|---|---|---|
| committer | Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> | 2018-10-15 14:59:23 +0200 |
| commit | d33366badde6a2d51be8d731834540c03b9a6c49 (patch) | |
| tree | 8ecbb3de477371a29e95f1aa4d93b619bfa5f5e4 /slixmpp/test/slixtest.py | |
| parent | 809c50000204f8724bac80cb3359a690fdbc839e (diff) | |
| download | slixmpp-d33366badde6a2d51be8d731834540c03b9a6c49.tar.gz slixmpp-d33366badde6a2d51be8d731834540c03b9a6c49.tar.bz2 slixmpp-d33366badde6a2d51be8d731834540c03b9a6c49.tar.xz slixmpp-d33366badde6a2d51be8d731834540c03b9a6c49.zip | |
fixing deprecation warnings for pytest
Diffstat (limited to 'slixmpp/test/slixtest.py')
| -rw-r--r-- | slixmpp/test/slixtest.py | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/slixmpp/test/slixtest.py b/slixmpp/test/slixtest.py index b307b5c6..ff185368 100644 --- a/slixmpp/test/slixtest.py +++ b/slixmpp/test/slixtest.py @@ -222,7 +222,7 @@ class SlixTest(unittest.TestCase): if Matcher is None: raise ValueError("Unknown matching method.") test = Matcher(criteria) - self.failUnless(test.match(stanza), + self.assertTrue(test.match(stanza), "Stanza did not match using %s method:\n" % method + \ "Criteria:\n%s\n" % str(criteria) + \ "Stanza:\n%s" % str(stanza)) @@ -280,7 +280,7 @@ class SlixTest(unittest.TestCase): debug += "Generated stanza:\n%s\n" % highlight(tostring(stanza2.xml)) result = self.compare(xml, stanza.xml, stanza2.xml) - self.failUnless(result, debug) + self.assertTrue(result, debug) # ------------------------------------------------------------------ # Methods for simulating stanza streams. @@ -487,7 +487,7 @@ class SlixTest(unittest.TestCase): recv_xml.clear() recv_xml.attrib = attrib - self.failUnless( + self.assertTrue( self.compare(xml, recv_xml), "Stream headers do not match:\nDesired:\n%s\nReceived:\n%s" % ( '%s %s' % (xml.tag, xml.attrib), @@ -543,7 +543,7 @@ class SlixTest(unittest.TestCase): xml = self.parse_xml(header2) sent_xml = self.parse_xml(sent_header2) - self.failUnless( + self.assertTrue( self.compare(xml, sent_xml), "Stream headers do not match:\nDesired:\n%s\nSent:\n%s" % ( header, sent_header)) @@ -557,12 +557,12 @@ class SlixTest(unittest.TestCase): if sent_data is None: self.fail("No stanza was sent.") if method == 'exact': - self.failUnless(self.compare(xml, sent_xml), + self.assertTrue(self.compare(xml, sent_xml), "Features do not match.\nDesired:\n%s\nReceived:\n%s" % ( highlight(tostring(xml)), highlight(tostring(sent_xml)))) elif method == 'mask': matcher = MatchXMLMask(xml) - self.failUnless(matcher.match(sent_xml), + self.assertTrue(matcher.match(sent_xml), "Stanza did not match using %s method:\n" % method + \ "Criteria:\n%s\n" % highlight(tostring(xml)) + \ "Stanza:\n%s" % highlight(tostring(sent_xml))) |