From 906980f57a308f69171e885628110ae136d7777c Mon Sep 17 00:00:00 2001 From: Daniel Hahler Date: Wed, 13 Jun 2018 13:39:46 +0200 Subject: [PATCH] tests: fix DeprecationWarnings for assertEquals --- dkim/tests/test_arc.py | 4 ++-- dkim/tests/test_dkim.py | 4 ++-- dkim/tests/test_dkim_ed25519.py | 4 ++-- dkim/tests/test_util.py | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dkim/tests/test_arc.py b/dkim/tests/test_arc.py index e2f5e4e..f67b706 100644 --- a/dkim/tests/test_arc.py +++ b/dkim/tests/test_arc.py @@ -75,10 +75,10 @@ Y+vtSBczUiKERHv1yRbcaQtZFh5wtiRrN04BLUTD21MycBX5jYchHjPY/wIDAQAB""" expected_sig = [b'ARC-Seal: i=1; cv=none; a=rsa-sha256; d=example.com; s=test; t=12345; \r\n b=3jOfBfTKcq+3r3Xv158DybT4mWFxrGcop+cgyLUX2ETCMHqNXYwGx2h+NY46tr\r\n k0Lg6R8i+560+KC8PLcCURYYJNJUHLHPIifhddy1aMNL9l4CoI+Oz+rocd2IZeb/\r\n I9V5amOUOWnAlOvyrSt0XfzLJRTS8qJW3Is1CRkkgyLoI=\r\n', b'ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; \r\n d=example.com; s=test; t=12345; h=message-id : \r\n date : from : to : subject : date : from : \r\n subject; \r\n bh=wE7NXSkgnx9PGiavN4OZhJztvkqPDlemV3OGuEnLwNo=; \r\n b=Bj/AEKhmzMbltWXrfLA8UZNp6/5cj8/IzqbgQec4vGobDZRsa\r\n C0YIPM4tcqK2uTS62kwh40cndXTDsCppvRsBy1sIO3eRNyuLUOh\r\n 0XGrz0AdLQMv+IOdyQqZfMVkq8DuQ4Qdl7ee99uYf3D8S+L7GuD\r\n wJSk7dyH+P2BKxz2nyB0=\r\n', b'ARC-Authentication-Results: i=1; lists.example.org; arc=none;\r\n spf=pass smtp.mfrom=jqd@d1.example;\r\n dkim=pass (1024-bit key) header.i=@d1.example;\r\n dmarc=pass\r\n'] - self.assertEquals(expected_sig, sig_lines) + self.assertEqual(expected_sig, sig_lines) (cv, res, reason) = dkim.arc_verify(b''.join(sig_lines) + self.message, dnsfunc=self.dnsfunc) - self.assertEquals(cv, dkim.CV_Pass) + self.assertEqual(cv, dkim.CV_Pass) def test_suite(): from unittest import TestLoader diff --git a/dkim/tests/test_dkim.py b/dkim/tests/test_dkim.py index 2d9a59d..93e2b87 100644 --- a/dkim/tests/test_dkim.py +++ b/dkim/tests/test_dkim.py @@ -345,10 +345,10 @@ b/mPfjC0QJTocVBq6Za/PlzfV+Py92VaCak19F4WrbVTK5Gg5tW220MCAwEAAQ== canonicalize=(header_algo, body_algo)) dv = dkim.DKIM(sig + message) res = dv.verify(dnsfunc=self.dnsfunc) - self.assertEquals(d.include_headers,dv.include_headers) + self.assertEqual(d.include_headers,dv.include_headers) s = dkim.select_headers(d.headers,d.include_headers) sv = dkim.select_headers(dv.headers,dv.include_headers) - self.assertEquals(s,sv) + self.assertEqual(s,sv) self.assertTrue(res) def test_multiple_from_fails(self): diff --git a/dkim/tests/test_dkim_ed25519.py b/dkim/tests/test_dkim_ed25519.py index aeb7592..13a9371 100644 --- a/dkim/tests/test_dkim_ed25519.py +++ b/dkim/tests/test_dkim_ed25519.py @@ -213,10 +213,10 @@ yi50DjK5O9pqbFpNHklsv9lqaS0ArSYu02qp1S0DW1Y=\ canonicalize=(header_algo, body_algo)) dv = dkim.DKIM(sig + message) res = dv.verify(dnsfunc=self.dnsfunc) - self.assertEquals(d.include_headers,dv.include_headers) + self.assertEqual(d.include_headers,dv.include_headers) s = dkim.select_headers(d.headers,d.include_headers) sv = dkim.select_headers(dv.headers,dv.include_headers) - self.assertEquals(s,sv) + self.assertEqual(s,sv) self.assertTrue(res) def test_multiple_from_fails(self): diff --git a/dkim/tests/test_util.py b/dkim/tests/test_util.py index 2da48ea..e01b3b5 100644 --- a/dkim/tests/test_util.py +++ b/dkim/tests/test_util.py @@ -71,8 +71,8 @@ class TestParseTagValue(unittest.TestCase): 3KzW0yB9JHwiDCw1EioVkv+OMHhAYzoIypA0bQyi2bc=; ''' sig = parse_tag_value(hval) - self.assertEquals(sig[b't'],b'1308078492') - self.assertEquals(len(sig),11) + self.assertEqual(sig[b't'],b'1308078492') + self.assertEqual(len(sig),11) def test_suite():