diff tests/test_merge.py @ 221:a2afbf236ca8

hglib tests: remove deprecated constructions This mostly removes usage of 'assertEquals' (replaced with 'assertEqual'), as well as opening files without closing them (fixed using a 'with' statement).
author Mathias De Mare <mathias.de_mare@nokia.com>
date Thu, 09 Mar 2023 14:00:02 +0100
parents 8341f2494b3f
children
line wrap: on
line diff
--- a/tests/test_merge.py	Thu Mar 09 11:33:04 2023 +0100
+++ b/tests/test_merge.py	Thu Mar 09 14:00:02 2023 +0100
@@ -28,7 +28,7 @@
 \ No newline at end of file
 """)
 
-        self.assertEquals(diff, self.client.diff(change=node, nodates=True))
+        self.assertEqual(diff, self.client.diff(change=node, nodates=True))
 
     def test_merge_prompt_abort(self):
         self.client.update(self.node0)
@@ -56,7 +56,7 @@
 +aa
 \ No newline at end of file
 """)
-        self.assertEquals(diff, self.client.diff(nodates=True))
+        self.assertEqual(diff, self.client.diff(nodates=True))
 
     def test_merge_prompt_cb(self):
         self.client.update(self.node0)
@@ -75,4 +75,4 @@
 +aa
 \ No newline at end of file
 """)
-        self.assertEquals(diff, self.client.diff(nodates=True))
+        self.assertEqual(diff, self.client.diff(nodates=True))