grass.gunittest: Fix usage of assertEquals() removed from Python 3.12 (…

…#3009)
OSGeo · Jun 7, 2023 · df2c0bc · df2c0bc
1 parent e947568
commit df2c0bc
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 14 deletions.
diff --git a/python/grass/script/testsuite/test_script_raster.py b/python/grass/script/testsuite/test_script_raster.py
@@ -27,15 +27,15 @@ def tearDownClass(cls):
 
     def test_raster_what(self):
         res = gs.raster_what(self.raster, [self.coords])[0]
-        self.assertEquals(int(res[self.raster]["value"]), 100)
+        self.assertEqual(int(res[self.raster]["value"]), 100)
 
         res = gs.raster_what(self.raster, [self.coords], localized=True)[0]
-        self.assertEquals(int(res[self.raster][_("value")]), 100)
+        self.assertEqual(int(res[self.raster][_("value")]), 100)
 
     def test_raster_info(self):
         res = gs.raster_info(self.raster)
-        self.assertEquals(str(res["cols"]), str(self.region["cols"]))
-        self.assertEquals(str(res["north"]), str(self.region["n"]))
+        self.assertEqual(str(res["cols"]), str(self.region["cols"]))
+        self.assertEqual(str(res["north"]), str(self.region["n"]))
 
 
 if __name__ == "__main__":

diff --git a/python/grass/script/testsuite/test_start_command_functions.py b/python/grass/script/testsuite/test_start_command_functions.py
@@ -38,7 +38,7 @@ def test_multiple_underscores(self):
         proc = start_command("g.region", _raster_=self.raster, stderr=PIPE)
         stderr = proc.communicate()[1]
         returncode = proc.poll()
-        self.assertEquals(returncode, 1)
+        self.assertEqual(returncode, 1)
         self.assertIn(b"raster", stderr)
 
 
@@ -96,7 +96,7 @@ def test_write_labels_unicode(self):
             separator=":",
         )
         res = read_command("r.category", map=self.raster, separator=":").strip()
-        self.assertEquals(res, "1:kůň\n2:kráva\n3:ovečka\n4:býk")
+        self.assertEqual(res, "1:kůň\n2:kráva\n3:ovečka\n4:býk")
         self.assertIsInstance(res, str)
 
     def test_write_labels_bytes(self):
@@ -112,7 +112,7 @@ def test_write_labels_bytes(self):
         res = read_command(
             "r.category", map=self.raster, separator=":", encoding=None
         ).strip()
-        self.assertEquals(res, encode("1:kůň\n2:kráva\n3:ovečka\n4:býk"))
+        self.assertEqual(res, encode("1:kůň\n2:kráva\n3:ovečka\n4:býk"))
         self.assertIsInstance(res, bytes)
 
 

diff --git a/python/grass/script/testsuite/test_start_command_functions_nc.py b/python/grass/script/testsuite/test_start_command_functions_nc.py
@@ -27,14 +27,14 @@ def test_prefixed_underscore(self):
         proc = start_command("g.region", _raster=self.raster, stderr=PIPE)
         stderr = proc.communicate()[1]
         returncode = proc.poll()
-        self.assertEquals(returncode, 0, msg="Underscore as prefix was not accepted")
+        self.assertEqual(returncode, 0, msg="Underscore as prefix was not accepted")
         self.assertNotIn(b"_raster", stderr)
 
     def test_suffixed_underscore(self):
         proc = start_command("g.region", raster_=self.raster, stderr=PIPE)
         stderr = proc.communicate()[1]
         returncode = proc.poll()
-        self.assertEquals(
+        self.assertEqual(
             returncode,
             0,
             msg="Underscore as suffix was not accepted, stderr is:\n%s" % stderr,
@@ -45,7 +45,7 @@ def test_multiple_underscores(self):
         proc = start_command("g.region", _raster_=self.raster, stderr=PIPE)
         stderr = proc.communicate()[1]
         returncode = proc.poll()
-        self.assertEquals(returncode, 1, msg="Underscore at both sides was accepted")
+        self.assertEqual(returncode, 1, msg="Underscore at both sides was accepted")
         self.assertIn(b"raster", stderr)
 
 

diff --git a/raster3d/r3.to.rast/testsuite/test_a_b_coeff.py b/raster3d/r3.to.rast/testsuite/test_a_b_coeff.py
@@ -147,7 +147,7 @@ def test_a_b_coeff(self):
             pattern="%s_*" % self.rast2d,
             exclude="%s_*" % self.rast2d_ref,
         )
-        self.assertEquals(
+        self.assertEqual(
             len(rasts), 4, msg="Wrong number of 2D rasters present" " in the mapset"
         )
         ref_info = dict(cells=9)

diff --git a/raster3d/r3.to.rast/testsuite/test_integer_rounding.py b/raster3d/r3.to.rast/testsuite/test_integer_rounding.py
@@ -149,7 +149,7 @@ def test_rounding(self):
             pattern="%s_*" % self.rast2d,
             exclude="%s_*" % self.rast2d_ref,
         )
-        self.assertEquals(
+        self.assertEqual(
             len(rasts), 4, msg="Wrong number of 2D rasters present" " in the mapset"
         )
         ref_info = dict(cells=9)

diff --git a/raster3d/r3.to.rast/testsuite/test_nulls.py b/raster3d/r3.to.rast/testsuite/test_nulls.py
@@ -148,7 +148,7 @@ def test_b(self):
             pattern="%s_*" % self.rast2d,
             exclude="%s_*" % self.rast2d_ref,
         )
-        self.assertEquals(
+        self.assertEqual(
             len(rasts), 4, msg="Wrong number of 2D rasters present" " in the mapset"
         )
         ref_info = dict(cells=9)

diff --git a/raster3d/r3.to.rast/testsuite/test_small_data.py b/raster3d/r3.to.rast/testsuite/test_small_data.py
@@ -145,7 +145,7 @@ def test_a(self):
             pattern="%s_*" % self.rast2d,
             exclude="%s_*" % self.rast2d_ref,
         )
-        self.assertEquals(
+        self.assertEqual(
             len(rasts), 4, msg="Wrong number of 2D rasters present" " in the mapset"
         )
         ref_info = dict(cells=9)