Update deprecated Python methods.
This change replaces assertRegexpMatches() with assertRegex() and assertEquals() with assertEqual().
https://docs.python.org/3/library/unittest.html#unittest.TestCase.assertRegex
PiperOrigin-RevId: 646527672
Change-Id: I0b49877daa7d4865e5bfebcae137583f1c44af9f
diff --git a/examples/py_native/fail.py b/examples/py_native/fail.py
index 98e35f4..69956c0 100644
--- a/examples/py_native/fail.py
+++ b/examples/py_native/fail.py
@@ -6,7 +6,7 @@
class TestGetNumber(unittest.TestCase):
def test_fail(self):
- self.assertEquals(GetNumber(), 0)
+ self.assertEqual(GetNumber(), 0)
if __name__ == '__main__':
diff --git a/examples/py_native/test.py b/examples/py_native/test.py
index f9543aa..113b11e 100644
--- a/examples/py_native/test.py
+++ b/examples/py_native/test.py
@@ -8,10 +8,10 @@
class TestGetNumber(unittest.TestCase):
def test_ok(self):
- self.assertEquals(GetNumber(), 42)
+ self.assertEqual(GetNumber(), 42)
def test_fib(self):
- self.assertEquals(Fib(5), 8)
+ self.assertEqual(Fib(5), 8)
if __name__ == '__main__':
unittest.main()
diff --git a/src/test/py/bazel/action_temp_test.py b/src/test/py/bazel/action_temp_test.py
index 75c7f78..51de014 100644
--- a/src/test/py/bazel/action_temp_test.py
+++ b/src/test/py/bazel/action_temp_test.py
@@ -251,7 +251,7 @@
self.assertEqual(lines[0:3], [input_file_line, 'TMP:y', 'TEMP:y'])
tmp = lines[3].split('=', 1)[1]
temp = lines[4].split('=', 1)[1]
- self.assertRegexpMatches(tmp, expected_tmpdir_regex)
+ self.assertRegex(tmp, expected_tmpdir_regex)
self.assertEqual(tmp, temp)
else:
# 3 lines = input_file_line, foo, TMPDIR
@@ -259,7 +259,7 @@
self.fail('lines=%s' % lines)
self.assertEqual(lines[0:2], [input_file_line, 'foo'])
tmpdir = lines[2].split('=', 1)[1]
- self.assertRegexpMatches(tmpdir, expected_tmpdir_regex)
+ self.assertRegex(tmpdir, expected_tmpdir_regex)
if __name__ == '__main__':
diff --git a/src/test/py/bazel/launcher_test.py b/src/test/py/bazel/launcher_test.py
index ece5f6f..8489f03 100644
--- a/src/test/py/bazel/launcher_test.py
+++ b/src/test/py/bazel/launcher_test.py
@@ -78,15 +78,15 @@
self.assertEqual(len(stdout), 4)
self.assertEqual(stdout[0], 'hello java')
if self.IsWindows():
- self.assertRegexpMatches(
+ self.assertRegex(
stdout[1], r'java_runfiles=.*foo\\foo%s.runfiles' % binary_suffix)
self.assertEqual(stdout[2], 'runfiles_manifest_only=1')
- self.assertRegexpMatches(
+ self.assertRegex(
stdout[3], r'^runfiles_manifest_file=[a-zA-Z]:[/\\].*MANIFEST$')
else:
- self.assertRegexpMatches(stdout[1], r'java_runfiles=.*/foo/foo.runfiles')
+ self.assertRegex(stdout[1], r'java_runfiles=.*/foo/foo.runfiles')
self.assertEqual(stdout[2], 'runfiles_manifest_only=')
- self.assertRegexpMatches(stdout[3], r'^runfiles_manifest_file.*MANIFEST$')
+ self.assertRegex(stdout[3], r'^runfiles_manifest_file.*MANIFEST$')
def _buildShBinaryTargets(self, bazel_bin, bin1_suffix):
self.RunBazel(['build', '//foo:bin1.sh'])
@@ -159,7 +159,7 @@
self.assertEqual(stdout[0], 'hello shell')
if self.IsWindows():
self.assertEqual(stdout[1], 'runfiles_manifest_only=1')
- self.assertRegexpMatches(
+ self.assertRegex(
stdout[2],
(r'^runfiles_manifest_file='
r'[a-zA-Z]:/.*/foo/bin1.sh%s.runfiles/MANIFEST$' % bin1_suffix))
@@ -572,7 +572,7 @@
_, stdout, _ = self.RunProgram([binary, '--classpath_limit=0', print_cmd])
self.assertIn('-classpath', stdout)
classpath = stdout[stdout.index('-classpath') + 1]
- self.assertRegexpMatches(classpath, r'foo-[A-Za-z0-9]+-classpath.jar$')
+ self.assertRegex(classpath, r'foo-[A-Za-z0-9]+-classpath.jar$')
def testWindowsNativeLauncherInNonEnglishPath(self):
if not self.IsWindows():
diff --git a/tools/python/pywrapper_test.py b/tools/python/pywrapper_test.py
index baee22c..a014d7a 100644
--- a/tools/python/pywrapper_test.py
+++ b/tools/python/pywrapper_test.py
@@ -158,7 +158,7 @@
def assert_wrapper_failure(self, returncode, out, err, message):
self.assertEqual(returncode, 1, msg="Expected to exit with error code 1")
- self.assertRegexpMatches(
+ self.assertRegex(
err, message, msg="stderr did not contain expected string")
def test_finds_python(self):
