git-cl: Don't use assertRegexpMatches on tests.
Is not needed, and it's deprecated on Python 3.
Change-Id: I040891ff74708c6606b8c216da3a0bb98d44d977
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/2042281
Auto-Submit: Edward Lesmes <ehmaldonado@chromium.org>
Commit-Queue: Anthony Polito <apolito@google.com>
Reviewed-by: Anthony Polito <apolito@google.com>
diff --git a/tests/git_cl_test.py b/tests/git_cl_test.py
index 78f4c8e..c68ede2 100755
--- a/tests/git_cl_test.py
+++ b/tests/git_cl_test.py
@@ -2533,8 +2533,12 @@
bypass_hooks=True,
verbose=True,
parallel=False))
- self.assertRegexpMatches(out.getvalue(), 'Issue.*123 has been submitted')
- self.assertRegexpMatches(out.getvalue(), 'Landed as: .*deadbeef')
+ self.assertIn(
+ 'Issue chromium-review.googlesource.com/123 has been submitted',
+ out.getvalue())
+ self.assertIn(
+ 'Landed as: https://git.googlesource.com/test/+/deadbeef',
+ out.getvalue())
def _mock_gerrit_changes_for_detail_cache(self):
self.mock(git_cl.Changelist, '_GetGerritHost', lambda _: 'host')
@@ -2665,12 +2669,12 @@
os.path.expanduser('~/.gitcookies')], ), ''),
]
self.assertEqual(0, git_cl.main(['creds-check']))
- self.assertRegexpMatches(
- sys.stdout.getvalue(),
- '^You seem to be using outdated .netrc for git credentials:')
- self.assertRegexpMatches(
- sys.stdout.getvalue(),
- '\nConfigured git to use .gitcookies from')
+ self.assertTrue(
+ sys.stdout.getvalue().startswith(
+ 'You seem to be using outdated .netrc for git credentials:'))
+ self.assertIn(
+ '\nConfigured git to use .gitcookies from',
+ sys.stdout.getvalue())
def test_creds_check_gitcookies_configured_custom_broken(self):
self._common_creds_check_mocks()
@@ -2687,12 +2691,12 @@
os.path.expanduser('~/.gitcookies')], ), ''),
]
self.assertEqual(0, git_cl.main(['creds-check']))
- self.assertRegexpMatches(
- sys.stdout.getvalue(),
- 'WARNING: You have configured custom path to .gitcookies: ')
- self.assertRegexpMatches(
- sys.stdout.getvalue(),
- 'However, your configured .gitcookies file is missing.')
+ self.assertIn(
+ 'WARNING: You have configured custom path to .gitcookies: ',
+ sys.stdout.getvalue())
+ self.assertIn(
+ 'However, your configured .gitcookies file is missing.',
+ sys.stdout.getvalue())
def test_git_cl_comment_add_gerrit(self):
self.mock(git_cl.gerrit_util, 'SetReview',