Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 1 commit into from
Jun 7, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions python/grass/script/testsuite/test_script_raster.py
Original file line number Diff line number Diff line change
Expand Up @@ -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__":
Expand Down
6 changes: 3 additions & 3 deletions python/grass/script/testsuite/test_start_command_functions.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)


Expand Down Expand Up @@ -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):
Expand All @@ -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)


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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)


Expand Down
2 changes: 1 addition & 1 deletion raster3d/r3.to.rast/testsuite/test_a_b_coeff.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion raster3d/r3.to.rast/testsuite/test_integer_rounding.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion raster3d/r3.to.rast/testsuite/test_nulls.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion raster3d/r3.to.rast/testsuite/test_small_data.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down