fix "DeprecationWarning: Please use assertEqual instead."

They've been deprecated since python 3.2, which was released a long time
ago.

diff --git a/tests/import.TestCase b/tests/import.TestCase
index c53b53d46446739e7376629e1059bb39f1d7d317..4d5acc56520a8a95f7010d61571cec574f64c67d 100755 (executable)
--- 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 c287a212723db8723326ceb51490f0072d64d844..0cdf3164861576067019e8815b7662a8ecd1190a 100755 (executable)
--- 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 0cc93e5c8b8880dd0c2200587b98b3310944f488..6de1cf218601599ef62a00ad1028a3e180cf0db8 100755 (executable)
--- 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!')