From 547a57e69324bfb70b825e61674dc65311b7f712 Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Fri, 10 Jun 2016 12:02:03 +0200 Subject: [PATCH] fix "DeprecationWarning: Please use assertEqual instead." They've been deprecated since python 3.2, which was released a long time ago. --- tests/import.TestCase | 6 +++--- tests/metadata.TestCase | 2 +- tests/update.TestCase | 12 ++++++------ 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/tests/import.TestCase b/tests/import.TestCase index c53b53d4..4d5acc56 100755 --- a/tests/import.TestCase +++ b/tests/import.TestCase @@ -33,9 +33,9 @@ class ImportTest(unittest.TestCase): app = fdroidserver.metadata.get_default_app_info() app.UpdateCheckMode = "Tags" root_dir, src_dir = import_proxy.get_metadata_from_url(app, url) - self.assertEquals(app.RepoType, 'git') - self.assertEquals(app.WebSite, 'https://gitlab.com/fdroid/fdroidclient') - self.assertEquals(app.Repo, 'https://gitlab.com/fdroid/fdroidclient.git') + self.assertEqual(app.RepoType, 'git') + self.assertEqual(app.WebSite, 'https://gitlab.com/fdroid/fdroidclient') + self.assertEqual(app.Repo, 'https://gitlab.com/fdroid/fdroidclient.git') if __name__ == "__main__": diff --git a/tests/metadata.TestCase b/tests/metadata.TestCase index c287a212..0cdf3164 100755 --- a/tests/metadata.TestCase +++ b/tests/metadata.TestCase @@ -44,7 +44,7 @@ class MetadataTest(unittest.TestCase): self.assertTrue(appid in apps) with open(savepath, 'rb') as f: frompickle = pickle.load(f) - self.assertEquals(frommeta, frompickle) + self.assertEqual(frommeta, frompickle) # Uncomment to overwrite # with open(savepath, 'wb') as f: # pickle.dump(frommeta, f) diff --git a/tests/update.TestCase b/tests/update.TestCase index 0cc93e5c..6de1cf21 100755 --- a/tests/update.TestCase +++ b/tests/update.TestCase @@ -55,13 +55,13 @@ class UpdateTest(unittest.TestCase): self.assertIsNotNone(sig, "sig is None") pysig = fdroidserver.update.getsig(apkfile) self.assertIsNotNone(pysig, "pysig is None") - self.assertEquals(sig, fdroidserver.update.getsig(apkfile), - "python sig not equal to java sig!") - self.assertEquals(len(sig), len(pysig), - "the length of the two sigs are different!") + self.assertEqual(sig, fdroidserver.update.getsig(apkfile), + "python sig not equal to java sig!") + self.assertEqual(len(sig), len(pysig), + "the length of the two sigs are different!") try: - self.assertEquals(unhexlify(sig), unhexlify(pysig), - "the length of the two sigs are different!") + self.assertEqual(unhexlify(sig), unhexlify(pysig), + "the length of the two sigs are different!") except TypeError as e: print(e) self.assertTrue(False, 'TypeError!') -- 2.30.2